From 6c7e69996f5ac1be846d0c04f7cee6444ebfdbb5 Mon Sep 17 00:00:00 2001
From: Evgeny Matusov <ematusov@ebay.com>
Date: Thu, 19 Nov 2015 08:03:12 -0700
Subject: [PATCH] updated the regression testing wrapper script

---
 regression-testing/run-single-test.perl | 2 +-
 run-regtests.sh                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/regression-testing/run-single-test.perl b/regression-testing/run-single-test.perl
index 1ff8ddb12..c99165247 100755
--- a/regression-testing/run-single-test.perl
+++ b/regression-testing/run-single-test.perl
@@ -42,7 +42,7 @@ if($run_server_test)
   if ($@) {
     die "Error: XMLRPC::Lite not installed, moses server regression tests will not be run. $@";
   }
-  exit(1) if($startupTest);
+  exit(0) if($startupTest);
 }
 
 die "Please specify a decoder with --decoder\n" unless $decoder;
diff --git a/run-regtests.sh b/run-regtests.sh
index e4120ea26..2cb73aa2d 100755
--- a/run-regtests.sh
+++ b/run-regtests.sh
@@ -4,8 +4,8 @@
 
 set -e -o pipefail
 
-git submodule init
-git submodule update regtest
+# git submodule init
+# git submodule update regtest
 
 if [ "$RECOMPILE" == "NO" ] ; then
   RECOMPILE=
@@ -14,9 +14,9 @@ else
 fi
 
 # test compilation without xmlrpc-c
-# ./bjam -j$(nproc) --with-irstlm=./opt --with-boost=./opt --with-cmph=./opt --no-xmlrpc-c --with-regtest=./regtest $RECOMPILE -q $@ || exit $?
+./bjam -j$(nproc) --with-irstlm=./opt --with-boost=./opt --with-cmph=./opt --no-xmlrpc-c --with-regtest=./regtest $RECOMPILE -q $@ || exit $?
 
 # test compilation with xmlrpc-c
-if [ ./regression-testing/run-single-test.perl --server --startuptest ] ; then
+if ./regression-testing/run-single-test.perl --server --startuptest  ; then
   ./bjam -j$(nproc) --with-irstlm=./opt --with-boost=./opt --with-cmph=./opt --with-xmlrpc-c=./opt --with-regtest=./regtest $RECOMPILE -q $@
 fi