From 6d1f85dcdcf32117332b48563357d311a2886c30 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 15 Aug 2013 12:54:40 -0700 Subject: [PATCH] Change hard-coded temporary directory. The properties tests creates a temporary directory in /data/nativetest, but this directory might not exist in all circumstances. Change this to create the temporary directory in /data/local/tmp. (cherry picked from commit bd6dc6a8864a1997eb8608030ac816740169c463) Change-Id: I15144ece7ffb5c29eded9a1ef399db630f6af5ab --- tests/property_benchmark.cpp | 4 ++-- tests/system_properties_test.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/property_benchmark.cpp b/tests/property_benchmark.cpp index d10be915e..4311a1db4 100644 --- a/tests/property_benchmark.cpp +++ b/tests/property_benchmark.cpp @@ -32,10 +32,10 @@ struct LocalPropertyTestState { LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) { static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_"; - char dir_template[] = "/data/nativetest/prop-XXXXXX"; + char dir_template[] = "/data/local/tmp/prop-XXXXXX"; char *dirname = mkdtemp(dir_template); if (!dirname) { - perror("making temp file for test state failed (is /data/nativetest writable?)"); + perror("making temp file for test state failed (is /data/local/tmp writable?)"); return; } diff --git a/tests/system_properties_test.cpp b/tests/system_properties_test.cpp index b9256c664..0a8cfa519 100644 --- a/tests/system_properties_test.cpp +++ b/tests/system_properties_test.cpp @@ -28,10 +28,10 @@ extern void *__system_property_area__; struct LocalPropertyTestState { LocalPropertyTestState() : valid(false) { - char dir_template[] = "/data/nativetest/prop-XXXXXX"; + char dir_template[] = "/data/local/tmp/prop-XXXXXX"; char *dirname = mkdtemp(dir_template); if (!dirname) { - perror("making temp file for test state failed (is /data/nativetest writable?)"); + perror("making temp file for test state failed (is /data/local/tmp writable?)"); return; }