commit f11cfc83cf7423655f7dec3ff9bcd57960bce4a3
author Elliott Hughes <enh@google.com> Tue Jul 02 16:25:25 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 02 16:25:25 2019 +0000
tree 3a78112a4afb707cb07cc2c43a81e689f08e4233
parent f749c212fbec642b8baecdf8b14457b19fbe18ac
parent a0e4b6c9553a729881895fdf6ec91658f6b07c6b

Merge changes I8bf8a347,Ifd81d7f8,I5f6555d8,Ia7fdbaae,I05e5b66a, ...

* changes:
  Merge remote-tracking branch 'toybox/master' into HEAD
  Bash Compatibility Patch
  modinfo: various small fixes.
  split.test: don't rely on bash process substitution.
  file, stat: various small improvements.
  touch.test: add missing `TZ=utc`s.

Android.bp

diff --git a/Android.bp b/Android.bp
index c87d48a..1293aca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -475,9 +475,12 @@
     src: "run-tests-on-android.sh",
     filename: "run-tests-on-android.sh",
     test_suites: ["general-tests"],
+    host_supported: true,
+    device_supported: false,
     test_config: "toybox-tests.xml",
     data: [
         "tests/**/*",
         "scripts/runtest.sh",
     ],
 }
+

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..efe4ac5
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "postsubmit": [
+    {
+      "name": "toybox-tests"
+    }
+  ]
+}