Integrate frog tests into presubmit.sh

tools/presubmit.sh

 #!/bin/bash
 #
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 # A quick check over a subset the tests in the runtime, compiler 
 # and client directories.
 
@@ skipping 72 matching lines @@
 fi
 
 echo
 echo "--- Building release ---"
 doBuild ia32 release
 
 echo
 echo "--- Building debug ---"
 doBuild ia32 debug
 
-
+# Create a symlink for the Dart VM for frog

[ngeoffray, 2011/11/03 12:33:05]

Not needed anymore.

[zundel, 2011/11/03 13:21:35]

Done.

+if [ ! -f frog/bin/dart_bin ] ; then
+  mkdir -p frog/bin
+  DART_BIN=`pwd`/out/Release_ia32/dart_bin 
+  ln -s $DART_BIN frog/bin/
+fi
 
 echo
 echo "=== Runtime tests === "
 echo " Debug (Ctrl-C to skip this set of tests)"
 doTest runtime vm debug
 RUNTIME_RESULT=$?
 if [ ${RUNTIME_RESULT} == 0 ] ; then
   echo " Release (Ctrl-C to skip this set of tests)"
   doTest runtime vm release 
   RUNTIME_RESULT=$?
 fi
 
 
 echo
-echo "=== Compiler tests ==="
+echo "=== dartc tests ==="
 echo " Debug mode (Ctrl-C to skip this set of tests)"
 doTest compiler dartc debug
-COMPILER_RESULT=$?
+DARTC_RESULT=$?
 
 if [ ${DO_OPTIMIZE} == 1 ] ; then
   echo " Release mode (--optimize)"
   doTest compiler dartc release
   RESULT=$?
   if [ ${RESULT} != 0 ] ; then
-    COMPILER_RESULT=${RESULT}
+    DARTC_RESULT=${RESULT}
   fi
 fi
 
 echo
+echo "=== frog tests ==="
+# TODO(zundel): Update once frog is integrated into test.py

[ngeoffray, 2011/11/03 12:33:05]

I think running presubmit.py is just fine.

+cd frog 
+./presubmit.py
+FROG_RESULT=$?
+if [ ${FROG_RESULT} != 0 ] ; then
+  TESTS_FAILED=1
+fi
+cd -

[Siggi Cherem (dart-lang), 2011/11/02 23:22:00]

I didn't know about 'cd -' that's pretty cool :)

+
+echo
 echo "=== Client tests ==="
 echo " Chromium  (Ctrl-C to skip this set of tests)"
 doTest client chromium debug
 CLIENT_RESULT=$?
 
 if [ ${DO_OPTIMIZE} == 1 ] ; then
   echo " Chromium Release mode (--optimize)"
   doTest compiler chromium release
   RESULT=$?
   if [ ${RESULT} != 0 ] ; then
     CLIENT_RESULT=${RESULT}
   fi
 fi
 
 if [ ${DO_DARTIUM} == 1 ] ; then
   echo " Dartium (Ctrl-C to skip this set of tests)"
   doTest client dartium release
   RESULT=$?
   if [ ${RESULT} != 0 ] ; then
     CLIENT_RESULT=${RESULT}
   fi
 fi
 
 # Print summary of results
 if [ ${RUNTIME_RESULT}  != 0 ] ; then
-  echo "*** Runtime tests failed"
+  echo "*** vm tests failed"
 fi
 
-if [ ${COMPILER_RESULT}  != 0 ] ; then
-  echo "*** Compiler tests failed"
+if [ ${DARTC_RESULT}  != 0 ] ; then
+  echo "*** dartc tests failed"
+fi
+
+if [ ${FROG_RESULT}  != 0 ] ; then
+  echo "*** frog tests failed"
 fi
 
 if [ ${CLIENT_RESULT}  != 0 ] ; then
-  echo "*** Client tests failed"
+  echo "*** client tests failed"
 fi
 
 if [ ${TESTS_FAILED} == 0 ] ; then
   echo "All presubmit tests passed!"
 fi