Merge some NightlyTest.pl changes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29579 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl
index e44bae6c881d8d4c5a5f1c96cf26639762c523fe..e917abf1ac19c9915a3f2acdbf226fa3715d41df 100755 (executable)
--- a/utils/NewNightlyTest.pl
+++ b/utils/NewNightlyTest.pl
@@ -132,6 +132,7 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
                               $CONFIGUREARGS .= " --disable-llc_diffs"; next; } 
     if (/^-disable-jit$/)    { $PROGTESTOPTS .= " DISABLE_JIT=1";
                               $CONFIGUREARGS .= " --disable-jit"; next; }
+    if (/^-disable-cbe$/)    { $PROGTESTOPTS .= " DISABLE_CBE=1"; next; }
     if (/^-verbose$/)        { $VERBOSE = 1; next; }
     if (/^-debug$/)          { $DEBUG = 1; next; }
     if (/^-nice$/)           { $NICE = "nice "; next; }
@@ -168,8 +169,11 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
     if (/^-use-gmake/)    {
                        $MAKECMD = "gmake"; shift; next;
     }
+    if (/^-compileflags/)    {
+        $MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next;
+    }
     if (/^-extraflags/)      {
-       $PROGTESTOPTS .= " EXTRA_FLAGS=\'$ARGV[0]\'"; shift; next;
+        $CONFIGUREARGS .= " --with-extra-options=\'$ARGV[0]\'"; shift; next;
     }
     if (/^-noexternals$/)    { $NOEXTERNALS = 1; next; }
     if (/^-nodejagnu$/)      { $NODEJAGNU = 1; next; }