fixed argc and argv not being set in tests

iminkov · May 18, 2017 · ba71fd8 · ba71fd8
1 parent 4b482fb
commit ba71fd8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/dash/test/TestBase.h b/dash/test/TestBase.h
@@ -249,7 +249,7 @@ class TestBase : public ::testing::Test {
       ::testing::UnitTest::GetInstance()->current_test_info();
     LOG_MESSAGE("===> Running test case %s.%s ...",
                 test_info->test_case_name(), test_info->name());
-    dash::init(&TESTENV.argc, &TESTENV.argv);
+    dash::init(&TESTENV::argc, &TESTENV::argv);
 
     LOG_MESSAGE("-==- DASH initialized with %lu units", dash::size());
     dash::barrier();

diff --git a/dash/test/TestGlobals.h b/dash/test/TestGlobals.h
@@ -2,9 +2,10 @@
 #define DASH__TEST__TEST_GLOBALS_H_
 
 // store program arguments to pass to dash::init
-static struct testenv_t {
-  int     argc;
-  char ** argv;
-} TESTENV;
+class TESTENV {
+public:
+  static int     argc;
+  static char ** argv;
+};
 
 #endif // DASH__TEST__TEST_GLOBALS_H_
diff --git a/dash/test/main.cc b/dash/test/main.cc
@@ -15,14 +15,16 @@
 using ::testing::UnitTest;
 using ::testing::TestEventListeners;
 
+int     TESTENV::argc;
+char ** TESTENV::argv;
 
 int main(int argc, char * argv[])
 {
   char hostname[100];
   int team_myid = -1;
   int team_size = -1;
-  TESTENV.argc = argc;
-  TESTENV.argv = argv;
+  TESTENV::argc = argc;
+  TESTENV::argv = argv;
 
   gethostname(hostname, 100);
   std::string host(hostname);