am c058154b: am c8039337: Merge "Change hard-coded temporary directory."

* commit 'c058154b747f295c98ad771d3dec4065749ee1a9':
  Change hard-coded temporary directory.
This commit is contained in:
Christopher Ferris 2013-08-16 12:25:58 -07:00 committed by Android Git Automerger
commit 2389a26705
2 changed files with 4 additions and 4 deletions

View File

@ -32,10 +32,10 @@ struct LocalPropertyTestState {
LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) { LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_"; 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); char *dirname = mkdtemp(dir_template);
if (!dirname) { 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; return;
} }

View File

@ -28,10 +28,10 @@ extern void *__system_property_area__;
struct LocalPropertyTestState { struct LocalPropertyTestState {
LocalPropertyTestState() : valid(false) { LocalPropertyTestState() : valid(false) {
char dir_template[] = "/data/nativetest/prop-XXXXXX"; char dir_template[] = "/data/local/tmp/prop-XXXXXX";
char *dirname = mkdtemp(dir_template); char *dirname = mkdtemp(dir_template);
if (!dirname) { 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; return;
} }