diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-07-29 15:49:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-05 14:53:18 +0200 |
| commit | 3b12fa2c0427ef2fdfd3dfb4a58eb83c8cf8c98a (patch) | |
| tree | 02b61d9e0f914ff8dcb4468b5f5f9d14ebfb58fd /tests | |
| parent | c52bec9438f55c0452d2bfdb74bce0bfaf1fc401 (diff) | |
Fix clean-up code in Android autotest script
If the files directory is not world-readable as well as
writable, the "rm *" command will fail because it cannot list
the files to delete.
Task-number: QTBUG-32079
Change-Id: Idb32a2be3184b9ffc43d011136fcc6f2a2a01756
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java b/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java index cefca44ae5..ed190fdc1b 100644 --- a/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java +++ b/tests/auto/android/src/org/qtproject/qt5/android/QtActivity.java @@ -62,9 +62,9 @@ public class QtActivity extends Activity { QtNative.loadQtLibraries(libs); // start application - final String envPaths = "NECESSITAS_API_LEVEL=2\tHOME=" + getDir("files", MODE_WORLD_WRITEABLE).getAbsolutePath() + - "\tTMPDIR=" + getDir("files", MODE_WORLD_WRITEABLE).getAbsolutePath() + - "\tCACHE_PATH=" + getDir("files", MODE_WORLD_WRITEABLE).getAbsolutePath(); + final String envPaths = "NECESSITAS_API_LEVEL=2\tHOME=" + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE).getAbsolutePath() + + "\tTMPDIR=" + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE).getAbsolutePath() + + "\tCACHE_PATH=" + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE).getAbsolutePath(); if (environment != null && environment.length() > 0) environment = envPaths + "\t" + environment; else @@ -138,7 +138,7 @@ public class QtActivity extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getDir("files", MODE_WORLD_WRITEABLE); + getDir("files", MODE_WORLD_WRITEABLE | MODE_WORLD_READABLE); requestWindowFeature(Window.FEATURE_NO_TITLE); m_quitApp = true; QtNative.setMainActivity(this); |