commit b14c7560f7317a89ddf4b9e8eceaf16cb3339fd1
author Etan Cohen <etancohen@google.com> Wed Jul 12 13:18:41 2017 -0700
committer Etan Cohen <etancohen@google.com> Tue Jul 18 10:52:10 2017 -0700
tree c7109b92c5b74305084484eeefd96a71dcaf33ad
parent e034df064094614ac5a35ddc09be6a5894d115c3

[VTS][NAN] Restore NAN test: configure for device support

Restore NAN test and use configuration which determines test
result based on whether or not the platform supports NAN.

Bug: 63131342
Test: NAN-supporting devices: pass (the NAN tests)
Test: Non-NAN-supporting device: pass
Change-Id: I6600abc531d4eb1dea6c501f6a39ef37051cb923

wifi/1.1/vts/functional/VtsHalWifiV1_1TargetTest.cpp

diff --git a/wifi/1.1/vts/functional/VtsHalWifiV1_1TargetTest.cpp b/wifi/1.1/vts/functional/VtsHalWifiV1_1TargetTest.cpp
index 160fcd2..9b92b57 100644
--- a/wifi/1.1/vts/functional/VtsHalWifiV1_1TargetTest.cpp
+++ b/wifi/1.1/vts/functional/VtsHalWifiV1_1TargetTest.cpp
@@ -20,10 +20,16 @@
 
 #include "wifi_hidl_test_utils.h"
 
+WifiHidlEnvironment* gEnv;
+
 int main(int argc, char** argv) {
-    ::testing::AddGlobalTestEnvironment(new WifiHidlEnvironment);
+    gEnv = new WifiHidlEnvironment();
+    ::testing::AddGlobalTestEnvironment(gEnv);
     ::testing::InitGoogleTest(&argc, argv);
-    int status = RUN_ALL_TESTS();
-    LOG(INFO) << "Test result = " << status;
+    int status = gEnv->initFromOptions(argc, argv);
+    if (status == 0) {
+        int status = RUN_ALL_TESTS();
+        LOG(INFO) << "Test result = " << status;
+    }
     return status;
 }