[kaffe] CVS kaffe (robilad): regression testing script and docs cleanup
Kaffe CVS
cvs-commits at kaffe.org
Thu Dec 13 08:28:26 PST 2007
PatchSet 7605
Date: 2007/12/13 16:25:50
Author: robilad
Branch: HEAD
Tag: (none)
Log:
regression testing script and docs cleanup
2007-12-13 Dalibor Topic <robilad at kaffe.org>
* test/regression/TestScript.in: Removed undocumented No Line Numbers,
and No Stack Trace features.
* FAQ/FAQ.debugging: Removed Skip Run documentation.
* test/regression/TestScript.in: Removed documentation for SkipRun
(runtest): Removed Skip Run support.
* test/regression/SecurityMan.java,
test/regression/TestFloatDouble.java: Removed SkipRun.
* FAQ/FAQ.debugging: Removed documentation for Sources feature.
* test/regression/TestScript.in: Removed documentation for Sources line,
as we compile all tests at once.
* test/regression/LoaderTest.java, test/regression/ClassGC.java,
test/regression/ZipVerify.java: Removed unnecessary Sources line.
* FAQ/FAQ.debugging: Removed javac flags documentation, as they are
no longer evaluated by the regression test script.
2007-12-13 Dalibor Topic <robilad at kaffe.org>
* configure.ac: Removed configuration boilerplate for included GNU Classpath.
Reported by: Kiyo Inaba <inaba at src.ricoh.co.jp>
Members:
ChangeLog:1.5102->1.5103
configure:1.602->1.603
configure.ac:1.274->1.275
FAQ/FAQ.debugging:1.7->1.8
test/regression/ClassGC.java:1.9->1.10
test/regression/LoaderTest.java:1.4->1.5
test/regression/SecurityMan.java:1.2->1.3
test/regression/TestFloatDouble.java:1.3->1.4
test/regression/TestScript.in:1.55->1.56
test/regression/ZipVerify.java:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5102 kaffe/ChangeLog:1.5103
--- kaffe/ChangeLog:1.5102 Sun Dec 9 20:46:49 2007
+++ kaffe/ChangeLog Thu Dec 13 16:25:50 2007
@@ -1,3 +1,33 @@
+2007-12-13 Dalibor Topic <robilad at kaffe.org>
+
+ * test/regression/TestScript.in: Removed undocumented No Line Numbers,
+ and No Stack Trace features.
+
+ * FAQ/FAQ.debugging: Removed Skip Run documentation.
+
+ * test/regression/TestScript.in: Removed documentation for SkipRun
+ (runtest): Removed Skip Run support.
+
+ * test/regression/SecurityMan.java,
+ test/regression/TestFloatDouble.java: Removed SkipRun.
+
+ * FAQ/FAQ.debugging: Removed documentation for Sources feature.
+
+ * test/regression/TestScript.in: Removed documentation for Sources line,
+ as we compile all tests at once.
+
+ * test/regression/LoaderTest.java, test/regression/ClassGC.java,
+ test/regression/ZipVerify.java: Removed unnecessary Sources line.
+
+ * FAQ/FAQ.debugging: Removed javac flags documentation, as they are
+ no longer evaluated by the regression test script.
+
+2007-12-13 Dalibor Topic <robilad at kaffe.org>
+
+ * configure.ac: Removed configuration boilerplate for included GNU Classpath.
+
+ Reported by: Kiyo Inaba <inaba at src.ricoh.co.jp>
+
2007-12-09 Dalibor Topic <robilad at kaffe.org>
* m4/ac_prog_javac.m4, m4/ac_prog_javac_works.m4, m4/ac_try_compile_java.m4: New files.
Index: kaffe/configure
diff -u kaffe/configure:1.602 kaffe/configure:1.603
--- kaffe/configure:1.602 Sun Dec 9 20:46:49 2007
+++ kaffe/configure Thu Dec 13 16:25:59 2007
@@ -1082,8 +1082,7 @@
F77
FFLAGS
XMKMF'
-ac_subdirs_all='libraries/javalib/external/classpath
-libltdl'
+ac_subdirs_all='libltdl'
# Initialize some variables set by options.
ac_init_help=
@@ -7135,7 +7134,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7138 "configure"' > conftest.$ac_ext
+ echo '#line 7137 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9699,11 +9698,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9702: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9706: \$? = $ac_status" >&5
+ echo "$as_me:9705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9989,11 +9988,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9992: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9991: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9996: \$? = $ac_status" >&5
+ echo "$as_me:9995: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10093,11 +10092,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10096: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10095: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10100: \$? = $ac_status" >&5
+ echo "$as_me:10099: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12442,7 +12441,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12445 "configure"
+#line 12444 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12542,7 +12541,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12545 "configure"
+#line 12544 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14966,11 +14965,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14969: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14973: \$? = $ac_status" >&5
+ echo "$as_me:14972: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15070,11 +15069,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15073: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15072: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15077: \$? = $ac_status" >&5
+ echo "$as_me:15076: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16632,11 +16631,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16639: \$? = $ac_status" >&5
+ echo "$as_me:16638: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16736,11 +16735,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16739: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16738: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16743: \$? = $ac_status" >&5
+ echo "$as_me:16742: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18927,11 +18926,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18930: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18929: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18934: \$? = $ac_status" >&5
+ echo "$as_me:18933: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19217,11 +19216,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19220: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19219: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19224: \$? = $ac_status" >&5
+ echo "$as_me:19223: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19321,11 +19320,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19324: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19328: \$? = $ac_status" >&5
+ echo "$as_me:19327: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -26106,7 +26105,7 @@
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
-/* #line 26109 "configure" */
+/* #line 26108 "configure" */
public class Test {
}
EOF
@@ -47753,7 +47752,7 @@
-CPPFLAGS="-I$abssrcdir/kaffe/kaffevm -I$abssrcdir/kaffe/kaffevm/$with_engine -I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/replace -I\$(top_srcdir)/config -I\$(top_srcdir)/include -I\$(top_srcdir)/libraries/javalib/external/classpath/include $CPPFLAGS"
+CPPFLAGS="-I$abssrcdir/kaffe/kaffevm -I$abssrcdir/kaffe/kaffevm/$with_engine -I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/replace -I\$(top_srcdir)/config -I\$(top_srcdir)/include $CPPFLAGS"
LIBS="$LIBS $LTLIBS"
CFLAGS_WITHOUT_PG=""
@@ -47766,42 +47765,6 @@
-
-
-
-
-# Preset the compiler to jikes, since GNU Classpath's default is gcj.
-# Unfortunately, many gcj versions are incapable of compiling GNU
-# Classpath, while many versions of jikes seem to make it through. :/
-
-if test x"$use_jikes" = x"yes"; then
- ac_configure_args="$ac_configure_args --with-jikes=${JIKESPROG}"
-fi
-
-if test x"$use_ecj" = x"yes"; then
- ac_configure_args="$ac_configure_args --with-ecj=${JAVAC}"
-fi
-
-if test x"$enable_native_awt" = x"no"; then
- ac_configure_args="$ac_configure_args --disable-gtk-peer"
-fi
-
-if test x"$COMPILE_PLUGIN" = x"no"; then
- ac_configure_args="$ac_configure_args --disable-plugin"
-fi
-
-ac_configure_args="$ac_configure_args --with-vm=${prefix}/bin/kaffe"
-ac_configure_args="$ac_configure_args --disable-examples"
-ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}"
-ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}"
-
-if test x$use_glibj_zip = xtrue ; then
- ac_configure_args="$ac_configure_args --with-glibj=none";
-fi
-
-ac_configure_args="$ac_configure_args CFLAGS=\"${KAFFE_CFLAGS} ${CFLAGS}\"";
-
-subdirs="$subdirs libraries/javalib/external/classpath"
subdirs="$subdirs libltdl"
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.274 kaffe/configure.ac:1.275
--- kaffe/configure.ac:1.274 Sun Dec 9 20:46:50 2007
+++ kaffe/configure.ac Thu Dec 13 16:26:08 2007
@@ -2190,7 +2190,7 @@
AC_SUBST(kaffebin_TRANSF)
dnl These are not to be used during configuration, only during build.
-CPPFLAGS="-I$abssrcdir/kaffe/kaffevm -I$abssrcdir/kaffe/kaffevm/$with_engine -I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/replace -I\$(top_srcdir)/config -I\$(top_srcdir)/include -I\$(top_srcdir)/libraries/javalib/external/classpath/include $CPPFLAGS"
+CPPFLAGS="-I$abssrcdir/kaffe/kaffevm -I$abssrcdir/kaffe/kaffevm/$with_engine -I$abssrcdir/kaffe/kaffevm/systems/$with_threads -I\$(top_srcdir)/replace -I\$(top_srcdir)/config -I\$(top_srcdir)/include $CPPFLAGS"
LIBS="$LIBS $LTLIBS"
dnl Avoid GNU Make $(filter-out -pg, at CFLAGS@) in kaffe/xprof/Makefile.am
@@ -2207,50 +2207,6 @@
AC_SUBST(KAFFE_CFLAGS)
dnl Replace KAFFE_CCASFLAGS by the generated one
AC_SUBST(KAFFE_CCASFLAGS)
-
-dnl -------------------------
-dnl Update args for classpath
-dnl -------------------------
-
-dnl First we remove eventual CFLAGS from the configure call.
-dnl ac_configure_args=`echo "$ac_configure_args" | sed "s%'CFLAGS=.*'%%g"`
-dnl Then we add it again for config.status
-dnl ac_configure_args="$ac_configure_args 'CFLAGS=${CFLAGS}'"
-dnl ac_cv_env_CFLAGS_value="${CFLAGS}"
-dnl ac_cv_env_CFLAGS_set=set
-
-# Preset the compiler to jikes, since GNU Classpath's default is gcj.
-# Unfortunately, many gcj versions are incapable of compiling GNU
-# Classpath, while many versions of jikes seem to make it through. :/
-
-if test x"$use_jikes" = x"yes"; then
- ac_configure_args="$ac_configure_args --with-jikes=${JIKESPROG}"
-fi
-
-if test x"$use_ecj" = x"yes"; then
- ac_configure_args="$ac_configure_args --with-ecj=${JAVAC}"
-fi
-
-if test x"$enable_native_awt" = x"no"; then
- ac_configure_args="$ac_configure_args --disable-gtk-peer"
-fi
-
-if test x"$COMPILE_PLUGIN" = x"no"; then
- ac_configure_args="$ac_configure_args --disable-plugin"
-fi
-
-ac_configure_args="$ac_configure_args --with-vm=${prefix}/bin/kaffe"
-ac_configure_args="$ac_configure_args --disable-examples"
-ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}"
-ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}"
-
-if test x$use_glibj_zip = xtrue ; then
- ac_configure_args="$ac_configure_args --with-glibj=none";
-fi
-
-ac_configure_args="$ac_configure_args CFLAGS=\"${KAFFE_CFLAGS} ${CFLAGS}\"";
-
-AC_CONFIG_SUBDIRS([libraries/javalib/external/classpath])
AC_CONFIG_SUBDIRS([libltdl])
AC_CONFIG_HEADERS([config/config.h])
Index: kaffe/FAQ/FAQ.debugging
diff -u kaffe/FAQ/FAQ.debugging:1.7 kaffe/FAQ/FAQ.debugging:1.8
--- kaffe/FAQ/FAQ.debugging:1.7 Wed Oct 10 19:25:14 2007
+++ kaffe/FAQ/FAQ.debugging Thu Dec 13 16:26:11 2007
@@ -145,16 +145,6 @@
script what to do with them. The special comments and their
effects are:
-// Sources: SOURCES
-compile also these sources with current test case.
-
-// javac flags: FLAGS
-add some javac flags. For exemple -nowarn remove warning lines
-and therefore don't let's think that javac fail.
-
-// Skip Run
-Compile only
-
// java args: CLASSNAME [OPTIONS]
Replace current classname by this classname and options.
Index: kaffe/test/regression/ClassGC.java
diff -u kaffe/test/regression/ClassGC.java:1.9 kaffe/test/regression/ClassGC.java:1.10
--- kaffe/test/regression/ClassGC.java:1.9 Sun Nov 11 15:46:57 2007
+++ kaffe/test/regression/ClassGC.java Thu Dec 13 16:26:11 2007
@@ -112,7 +112,6 @@
public static boolean gotOneForG;
}
-// Sources: ClassGCTest.java ClassGCTestLater.java
/* Expected Output:
F Success.
G Success.
Index: kaffe/test/regression/LoaderTest.java
diff -u kaffe/test/regression/LoaderTest.java:1.4 kaffe/test/regression/LoaderTest.java:1.5
--- kaffe/test/regression/LoaderTest.java:1.4 Wed Jun 20 22:50:24 2001
+++ kaffe/test/regression/LoaderTest.java Thu Dec 13 16:26:11 2007
@@ -61,7 +61,6 @@
}
}
-// Sources: LoaderTest_Class0.java LoaderTest_Class1.java LoaderTest_Class1BeanInfo.java LoaderTest_Class2.java LoaderTest_Class3.java LoaderTest_Loader1.java LoaderTest_Loader2.java
/* Expected Output:
Loading Class0 with default ClassLoader
-> class LoaderTest_Class0 loader null
Index: kaffe/test/regression/SecurityMan.java
diff -u kaffe/test/regression/SecurityMan.java:1.2 kaffe/test/regression/SecurityMan.java:1.3
--- kaffe/test/regression/SecurityMan.java:1.2 Fri Jan 27 22:08:34 2006
+++ kaffe/test/regression/SecurityMan.java Thu Dec 13 16:26:11 2007
@@ -25,7 +25,6 @@
System.out.println("Ok");
}
}
-// Skip Run
/* Expected Output:
Ok
*/
Index: kaffe/test/regression/TestFloatDouble.java
diff -u kaffe/test/regression/TestFloatDouble.java:1.3 kaffe/test/regression/TestFloatDouble.java:1.4
--- kaffe/test/regression/TestFloatDouble.java:1.3 Sun Nov 11 15:46:57 2007
+++ kaffe/test/regression/TestFloatDouble.java Thu Dec 13 16:26:11 2007
@@ -20,10 +20,10 @@
System.out.println("Some mathmatical tests");
float f1 = 500.005f;
float f2 = 400.004f;
- test(f1 * f2, "200004");
+ test(f1 * f2, "200004.0");
double d1 = 500.005;
double d2 = 400.004;
- test(d1 * d2, "200004");
+ test(d1 * d2, "200004.00002");
String s = "Good";
if (failed)
s = "Bad";
@@ -31,7 +31,6 @@
}
}
-// Skip run
/* Expected Output:
Some mathmatical tests
Results Good
Index: kaffe/test/regression/TestScript.in
diff -u kaffe/test/regression/TestScript.in:1.55 kaffe/test/regression/TestScript.in:1.56
--- kaffe/test/regression/TestScript.in:1.55 Sun Dec 9 20:47:25 2007
+++ kaffe/test/regression/TestScript.in Thu Dec 13 16:26:11 2007
@@ -68,14 +68,6 @@
# grep will take care of stripping \r from DOS-like output
grep '.*' $TMPRESULT > "$RESULT"
fi
- if test "x$NO_LINE_NUMBERS" = "xyes"; then
- mv "$RESULT" "$TMPRESULT"
- sed 's/\.java\:[0123456789]*/\.java\:XXXX/g' $TMPRESULT > $RESULT
- fi
- if test "x$NO_STACK_TRACE" = "xyes"; then
- mv "$RESULT" "$TMPRESULT"
- sed '/at .*\.java/d' $TMPRESULT > $RESULT
- fi
rm -f $TMPRESULT
if test ! -f "$1.out"; then
if test "$error" = 0 || test "$error" = 77; then
@@ -101,16 +93,10 @@
# Execution options
#
-# Sources: <source1> [<source2> ...]
-# Specify another source file to compiled with this test.
-#
# Unsafe
# Add the CLASSPATH value to the BOOTCLASSPATH so the test can access kaffe
# internal classes.
#
-# Skip Run
-# Skip this test.
-#
# Sort Output
# Sort the output of the test.
#
@@ -136,24 +122,12 @@
BOOTCLASSPATH="${BOOTCLASSPATH}${PATHSEP}${CLASSPATH}"
CLASSPATH=""
fi
- if grep '// [Ss]kip [Rr]un' < "$1" > /dev/null; then
- error=0
- elif test $error = 0 ; then
+ if test $error = 0 ; then
if grep '// [Ss]ort [Oo]utput' < "$1" >/dev/null; then
SORT="yes"
else
SORT="no"
fi
- if grep '// [Nn]o [Ll]ine [Nn]umbers' < "$1" > /dev/null; then
- NO_LINE_NUMBERS="yes"
- else
- NO_LINE_NUMBERS="no"
- fi
- if grep '// [Nn]o [Ss]tack [Tt]race' < "$1" > /dev/null; then
- NO_STACK_TRACE="yes"
- else
- NO_STACK_TRACE="no"
- fi
sed '/^\/\* [Ee]xpected [Oo]utput:/,/\*\//p; d' < "$1" |
sed '1d;$d' > $basename.out
cmp -s $basename.out /dev/null && rm -f $basename.out
@@ -187,16 +161,6 @@
SORT="yes"
else
SORT="no"
- fi
- if grep '; [Nn]o [Ll]ine [Nn]umbers' < "$1" > /dev/null; then
- NO_LINE_NUMBERS="yes"
- else
- NO_LINE_NUMBERS="no"
- fi
- if grep '; [Nn]o [Ss]tack [Tt]race' < "$1" > /dev/null; then
- NO_STACK_TRACE="yes"
- else
- NO_STACK_TRACE="no"
fi
sed '/^; [Ee]xpected [Oo]utput:/,//p; d' < "$1" |
sed '1d' | sed '/^$/q' | sed '/^$/d' |
Index: kaffe/test/regression/ZipVerify.java
diff -u kaffe/test/regression/ZipVerify.java:1.5 kaffe/test/regression/ZipVerify.java:1.6
--- kaffe/test/regression/ZipVerify.java:1.5 Sun Nov 11 15:46:57 2007
+++ kaffe/test/regression/ZipVerify.java Thu Dec 13 16:26:11 2007
@@ -538,4 +538,3 @@
}
-// Sources: ZipVerifyUtils.java
More information about the kaffe
mailing list