commit 3a48896b9182de778a0df71a864a7ee5bc66f40e
author Hridya Valsaraju <hridya@google.com> Mon Dec 11 21:28:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 11 21:28:10 2017 +0000
tree 79ec1b2ddb4dbd1db7dadb62ae807de1dda075a4
parent e16e91dce513cb05379092cdaeae94c0c8a0b999
parent 75c2884d20a1e83384de968defc5888148d2224d

Use TREBLE_TESTING_OVERRIDE only in FMQ unit test client. am: a40834ee20 am: c9c9b69ee0
am: 75c2884d20

Change-Id: I6d4254cceb4d26662c9118689f018c02d3df70d1

tests/fmq_test

diff --git a/tests/fmq_test b/tests/fmq_test
index 02683c9..7c5bfbe 100644
--- a/tests/fmq_test
+++ b/tests/fmq_test
@@ -1,6 +1,6 @@
 source /data/nativetest64/hidl_test_helper
 
-TREBLE_TESTING_OVERRIDE=true run_all_tests \
+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 4416c54..6cefb63 100644
--- a/tests/msgq_test_client.cpp
+++ b/tests/msgq_test_client.cpp
@@ -890,3 +890,9 @@
         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();
+}