commit f6c6e86d77794a514658e5b1ca36ec392b5cd9d8
author Hridya Valsaraju <hridya@google.com> Tue Dec 19 19:30:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 19 19:30:47 2017 +0000
tree 42f2f7d4f1d763e39fa7996ac20f6c279e7ec04b
parent 3a48896b9182de778a0df71a864a7ee5bc66f40e
parent 4bfcb3c19d6e209e38214ab14b6bd882ffb6815d

Revert "Use TREBLE_TESTING_OVERRIDE only in FMQ unit test client." am: 9ddfcaefae am: d7937c1cbe
am: 4bfcb3c19d

Change-Id: If4699479dfebd28a9535f49b20abfaa97064ed4e

tests/fmq_test

diff --git a/tests/fmq_test b/tests/fmq_test
index 7c5bfbe..02683c9 100644
--- a/tests/fmq_test
+++ b/tests/fmq_test
@@ -1,6 +1,6 @@
 source /data/nativetest64/hidl_test_helper
 
-run_all_tests \
+TREBLE_TESTING_OVERRIDE=true run_all_tests \
     "/data/nativetest/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
     "/data/nativetest64/android.hardware.tests.msgq@1.0-service-test/android.hardware.tests.msgq@1.0-service-test" \
     "/data/nativetest/mq_test_client/mq_test_client" \

tests/msgq_test_client.cpp

diff --git a/tests/msgq_test_client.cpp b/tests/msgq_test_client.cpp
index 6cefb63..4416c54 100644
--- a/tests/msgq_test_client.cpp
+++ b/tests/msgq_test_client.cpp
@@ -890,9 +890,3 @@
         ASSERT_FALSE(mQueue->read(&readData[0], mNumMessagesMax));
     }
 }
-
-int main(int argc, char** argv) {
-    setenv("TREBLE_TESTING_OVERRIDE", "true", true);
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}