Revert "Use TREBLE_TESTING_OVERRIDE only in FMQ unit test client." am: 9ddfcaefae
am: d7937c1cbe
Change-Id: Ic2e74e74236d862b2395592b59d8b5ca0d9a8da7
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" \
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();
-}