From 63effc3e04bb44260c0e437c4ecd43f08fde04f8 Mon Sep 17 00:00:00 2001
From: Chris Beck <render787@gmail.com>
Date: Sat, 5 Jul 2014 10:57:45 -0400
Subject: [PATCH] try bypassing the test wrapper script on travis

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b52c60f28c0a..ab7fcf25b01d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,9 @@ script:
     - scons cxxtool=$CXX --debug=time build=release extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS
     - "export DISPLAY=:99.0"
     - "sh -e /etc/init.d/xvfb start"
-    - if [[ "$CPP_TESTS" = true ]]; then time ./utils/travis/test_wrapper.sh; fi
-    - echo "$TEST_ERROR_CODE"
+    - if [[ "$CPP_TESTS" = true ]]; then time ./test; fi
+    - export TEST_ERROR_CODE=$?
+    - echo $TEST_ERROR_CODE
     - if [[ "$WML_TESTS" = true ]]; then time ./run_wml_tests -v -t "$WML_TEST_TIME"; fi
 after_failure:
     - if [ -f "errors.log" ]; then echo -e "\n*** \n*\n* Errors reported in wml unit tests, here is errors.log...\n*\n*** \n"; cat errors.log; fi