commit d79c1820eadae20de7b5c24a7b6f2a5892a581bb
author Elliott Hughes <enh@google.com> Thu Mar 19 20:30:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 19 20:30:59 2020 +0000
tree 11151bf6d0b1da95a3fb158b1ce640fc4ccd415e
parent 68a0ca2dade5b6707dd7068b3c59f3d1ead041be
parent 770ad011540740089f914257e76370b47aa2468a

Merge "Run bsdiff tests in presubmit." am: 69e0da7fdb am: 7ecc00a844 am: 64f9faac54 am: e3f693a705 am: 770ad01154

Change-Id: Ib13de04159ec25b95fa25ab7ee59bb6b911c2748

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..598f4c9
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "bsdiff_unittest"
+    }
+  ]
+}

test_utils.cc

diff --git a/test_utils.cc b/test_utils.cc
index eb079d5..c1350eb 100644
--- a/test_utils.cc
+++ b/test_utils.cc
@@ -53,11 +53,8 @@
 
 void BsdiffTestEnvironment::SetUp() {
 #ifdef BSDIFF_TARGET_UNITTEST
-#define BSDIFF_TARGET_TMP_BASE "/data/tmp"
-      if (access(BSDIFF_TARGET_TMP_BASE, F_OK) == -1) {
-        mkdir(BSDIFF_TARGET_TMP_BASE, S_IRWXU | S_IRWXG | S_IROTH | S_IWOTH);
-      }
-      setenv("TMPDIR", BSDIFF_TARGET_TMP_BASE, 1);
+#define BSDIFF_TARGET_TMP_BASE "/data/local/tmp"
+  setenv("TMPDIR", BSDIFF_TARGET_TMP_BASE, 1);
 #endif  // defined (BSDIFF_TARGET_UNITTEST)
 }