Tests/EndToEndTests/UnitTests/run-boost-test-common: add and use

henrykironde · Sep 1, 2016 · 887a2b9 · 887a2b9
1 parent 148d871
commit 887a2b9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 25 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -40,6 +40,7 @@ generate_build_info text eol=lf
 run-test text eol=lf
 run-test-common text eol=lf
 run-timit-test-common text eol=lf
+run-boost-test-common text eol=lf
 make_binary_drop_linux text eol=lf
 
 # Used from Unix / Cygwin 'md5sum -c', needs to have LF line endings:

diff --git a/Tests/EndToEndTests/UnitTests/BrainScriptTests/run-test b/Tests/EndToEndTests/UnitTests/BrainScriptTests/run-test
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 . $TEST_ROOT_DIR/run-test-common
+. $TEST_DIR/../run-boost-test-common
 
-if [ "$OS" == "Windows_NT" ]; then
-  TEST_BIN_DIR=$TEST_BIN_DIR/unittests
-fi
-
-$TEST_BIN_DIR/brainscripttests --report_level=detailed
+boosttestrun brainscripttests
diff --git a/Tests/EndToEndTests/UnitTests/EvalTests/run-test b/Tests/EndToEndTests/UnitTests/EvalTests/run-test
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 . $TEST_ROOT_DIR/run-test-common
+. $TEST_DIR/../run-boost-test-common
 
-if [ "$OS" == "Windows_NT" ]; then
-  TEST_BIN_DIR=$TEST_BIN_DIR/unittests
-fi
-
-$TEST_BIN_DIR/evaltests --report_level=detailed
+boosttestrun evaltests
diff --git a/Tests/EndToEndTests/UnitTests/MathTests/run-test b/Tests/EndToEndTests/UnitTests/MathTests/run-test
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 . $TEST_ROOT_DIR/run-test-common
+. $TEST_DIR/../run-boost-test-common
 
-if [ "$OS" == "Windows_NT" ]; then
-  TEST_BIN_DIR=$TEST_BIN_DIR/unittests
-fi
-
-$TEST_BIN_DIR/mathtests --report_level=detailed
+boosttestrun mathtests
diff --git a/Tests/EndToEndTests/UnitTests/NetworkTests/run-test b/Tests/EndToEndTests/UnitTests/NetworkTests/run-test
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 . $TEST_ROOT_DIR/run-test-common
+. $TEST_DIR/../run-boost-test-common
 
-if [ "$OS" == "Windows_NT" ]; then
-  TEST_BIN_DIR=$TEST_BIN_DIR/unittests
-fi
-
-$TEST_BIN_DIR/networktests --report_level=detailed
+boosttestrun networktests
diff --git a/Tests/EndToEndTests/UnitTests/ReaderTests/run-test b/Tests/EndToEndTests/UnitTests/ReaderTests/run-test
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 . $TEST_ROOT_DIR/run-test-common
+. $TEST_DIR/../run-boost-test-common
 
-if [ "$OS" == "Windows_NT" ]; then
-  TEST_BIN_DIR=$TEST_BIN_DIR/unittests
-fi
-
-$TEST_BIN_DIR/readertests --report_level=detailed
+boosttestrun readertests
diff --git a/Tests/EndToEndTests/UnitTests/run-boost-test-common b/Tests/EndToEndTests/UnitTests/run-boost-test-common
@@ -0,0 +1,10 @@
+boosttestrun()
+{
+  name=$1
+  local testpath=$TEST_BIN_DIR
+  if [ "$OS" == "Windows_NT" ]; then
+    testpath+=/unittests
+  fi
+
+  $testpath/$name --report_level=detailed
+}