Change strategy for freeing objects in the sweep.

[android-x86/dalvik.git] / run-core-tests.sh

diff --git a/run-core-tests.sh b/run-core-tests.sh
index b6ed423..0246206 100755 (executable)
--- a/run-core-tests.sh
+++ b/run-core-tests.sh
@@ -9,7 +9,7 @@
 #   $ . envsetup.sh
 #   $ lunch 2
 #   $ make
-#   $ make core-tests
+#   $ make CtsCoreTests
 #   $ ./dalvik/run-core-tests.sh
 #
 # Note: You may also specify a specific test as an argument.
@@ -17,6 +17,7 @@
 datadir=/tmp/${USER}
 base=$OUT
 framework=$base/system/framework
+apps=$base/data/app
 
 export ANDROID_PRINTF_LOG=tag
 export ANDROID_LOG_TAGS='*:w' # was: jdwp:i dalvikvm:i dalvikvmi:i'
@@ -24,13 +25,37 @@ export ANDROID_DATA=$datadir
 export ANDROID_ROOT=$base/system
 
 debug_opts=-Xcheck:jni
-debug_opts="$debug_opts -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+
+OPTS=`getopt -o dl: --long debug,log:,help -n $0 -- "$@"`
+
+if [ $? != 0 ]; then echo "Terminating..." >&2; exit 1; fi
+
+eval set -- "$OPTS"
+
+while true; do
+    case "$1" in
+        -d|--debug) debug_opts="$debug_opts -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"; shift ;;
+        -l) export ANDROID_LOG_TAGS='*:'$2; shift 2 ;;
+        --log) export ANDROID_LOG_TAGS="$2"; shift 2 ;;
+        --help)
+            echo usage: $0 [-d\|--debug] [-l\|--log] test.class.name;
+            printf "\t%-15s%s\n" "-d|--debug" "wait for the debugger";
+            printf "\t%-15s%s\n" "-l" "set the global logging level";
+            printf "\t%-15s%s\n" "--log" "set the logging TAG";
+            printf "\t%-15s%s\n" "--help" "this message";
+            exit 1;
+        ;;
+        --) shift; break ;;
+        *) echo "Internal Error!" >&2; exit 1 ;;
+    esac
+done
 
 export LD_LIBRARY_PATH=$base/system/lib
 export DYLD_LIBRARY_PATH=$base/system/lib
 
 exe=$base/system/bin/dalvikvm
-bpath=$framework/core.jar:$framework/ext.jar:$framework/framework.jar:$framework/core-tests.jar:$framework/http-tests.jar
+bpath=$framework/core.jar:$framework/ext.jar:$framework/framework.jar
+cpath=$framework/core-tests.jar
 
 # Notes:
 # (1) The IO tests create lots of files in the current directory, so we change
@@ -39,8 +64,14 @@ bpath=$framework/core.jar:$framework/ext.jar:$framework/framework.jar:$framework
 #     large value for both heap and stack. 
 
 rm -rf ${datadir}/xml_source
-mkdir ${datadir}/xml_source
+mkdir -p ${datadir}/xml_source
+mkdir -p ${datadir}/dalvik-cache
+cd $ANDROID_BUILD_TOP/dalvik
 cp -R libcore/xml/src/test/resources/* ${datadir}/xml_source
 
-cd $tmp
-exec $valgrind $exe -Djava.io.tmpdir=$tmp -Xmx512M -Xss32K -Xbootclasspath:$bpath $debug_opts com.google.coretests.Main "$@"
+cd $datadir
+exec $valgrind $exe \
+     -Duser.language=en -Duser.region=US -Djava.io.tmpdir=$datadir \
+     -Xmx512M -Xss32K \
+     -Xbootclasspath:$bpath -classpath $cpath $debug_opts \
+     com.google.coretests.Main "$@"