From 75316983a49d4d7cf50b103c04a1e8b3793308a3 Mon Sep 17 00:00:00 2001 From: twisti Date: Sun, 22 Jan 2006 21:38:47 +0000 Subject: [PATCH] * tests/regression/native/testarguments.output: Updated. * tests/regression/native/Makefile.am: Made it work with distcheck. * tests/regression/codepatching/Makefile.am: Likewise. * tests/regression/Makefile.am: Likewise. * tests/regression/extest.java: Comment changed. --- tests/regression/Makefile.am | 34 +++++---- tests/regression/codepatching/Makefile.am | 75 ++++++++++---------- tests/regression/extest.java | 2 +- tests/regression/native/Makefile.am | 63 ++++++++-------- tests/regression/native/testarguments.output | 24 +++---- 5 files changed, 100 insertions(+), 98 deletions(-) diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am index 030163840..6398b9ddc 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am @@ -28,27 +28,30 @@ ## ## Changes: ## -## $Id: Makefile.am 4330 2006-01-20 13:41:51Z twisti $ +## $Id: Makefile.am 4348 2006-01-22 21:38:47Z twisti $ ## Process this file with automake to produce Makefile.in -SUBDIRS = codepatching +SUBDIRS = codepatching native JAVA = $(top_builddir)/src/cacao/cacao JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) +SOURCE_FILES = \ + $(srcdir)/HelloWorld.java \ + $(srcdir)/jctest.java \ + $(srcdir)/fptest.java \ + $(srcdir)/fp.java \ + $(srcdir)/extest.java \ + $(srcdir)/extest_clinit.java \ + $(srcdir)/clinitexception.java \ + $(srcdir)/LoadDisplacementOverflow.java \ + $(srcdir)/FieldDisplacementOverflow.java \ + $(srcdir)/StackDisplacementOverflow.java + EXTRA_DIST = \ + $(SOURCE_FILES) \ Test.sh \ - HelloWorld.java \ - jctest.java \ - fptest.java \ - fp.java \ - extest.java \ - extest_clinit.java \ - clinitexception.java \ - LoadDisplacementOverflow.java \ - FieldDisplacementOverflow.java \ - StackDisplacementOverflow.java \ \ jctest.output \ fptest.output \ @@ -77,16 +80,17 @@ OUTPUT_JAVA_TESTS = \ FieldDisplacementOverflow \ StackDisplacementOverflow -check: $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS) +check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS) + +build: + @$(JAVAC) -d . $(SOURCE_FILES) $(SIMPLE_JAVA_TESTS): - @$(JAVAC) -d . $(srcdir)/$@.java @echo -n "$@: " @$(JAVA) $(JAVAFLAGS) $@ $(OUTPUT_JAVA_TESTS): - @$(JAVAC) -d . $(srcdir)/$@.java @$(SHELL) $(srcdir)/Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir) diff --git a/tests/regression/codepatching/Makefile.am b/tests/regression/codepatching/Makefile.am index 0625a0816..8a06b6060 100644 --- a/tests/regression/codepatching/Makefile.am +++ b/tests/regression/codepatching/Makefile.am @@ -28,7 +28,7 @@ ## ## Changes: ## -## $Id: Makefile.am 4314 2006-01-19 22:21:23Z twisti $ +## $Id: Makefile.am 4348 2006-01-22 21:38:47Z twisti $ ## Process this file with automake to produce Makefile.in @@ -36,37 +36,37 @@ JAVA = $(top_builddir)/src/cacao/cacao JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) SOURCE_FILES = \ - checkcastC.java \ - checkcastI.java \ - getfieldD.java \ - getfieldF.java \ - getfieldI.java \ - getfieldJ.java \ - getfieldL.java \ - getstaticD.java \ - getstaticF.java \ - getstaticI.java \ - getstaticJ.java \ - getstaticL.java \ - instanceofC.java \ - instanceofI.java \ - invokespecial.java \ - invokestatic.java \ - multianewarray.java \ - newarray.java \ - putfieldconstIF.java \ - putfieldconstJDL.java \ - putfieldD.java \ - putfieldF.java \ - putfieldI.java \ - putfieldJ.java \ - putfieldL.java \ - putstaticD.java \ - putstaticF.java \ - putstaticI.java \ - putstaticJ.java \ - putstaticL.java \ - test.java + $(srcdir)/checkcastC.java \ + $(srcdir)/checkcastI.java \ + $(srcdir)/getfieldD.java \ + $(srcdir)/getfieldF.java \ + $(srcdir)/getfieldI.java \ + $(srcdir)/getfieldJ.java \ + $(srcdir)/getfieldL.java \ + $(srcdir)/getstaticD.java \ + $(srcdir)/getstaticF.java \ + $(srcdir)/getstaticI.java \ + $(srcdir)/getstaticJ.java \ + $(srcdir)/getstaticL.java \ + $(srcdir)/instanceofC.java \ + $(srcdir)/instanceofI.java \ + $(srcdir)/invokespecial.java \ + $(srcdir)/invokestatic.java \ + $(srcdir)/multianewarray.java \ + $(srcdir)/newarray.java \ + $(srcdir)/putfieldconstIF.java \ + $(srcdir)/putfieldconstJDL.java \ + $(srcdir)/putfieldD.java \ + $(srcdir)/putfieldF.java \ + $(srcdir)/putfieldI.java \ + $(srcdir)/putfieldJ.java \ + $(srcdir)/putfieldL.java \ + $(srcdir)/putstaticD.java \ + $(srcdir)/putstaticF.java \ + $(srcdir)/putstaticI.java \ + $(srcdir)/putstaticJ.java \ + $(srcdir)/putstaticL.java \ + $(srcdir)/test.java EXTRA_DIST = \ $(SOURCE_FILES) @@ -107,14 +107,13 @@ CLASSES = \ putstaticL.class CLEANFILES = \ - $(MAINCLASS) \ - $(CLASSES) - -build: - $(JAVAC) $(SOURCE_FILES) + *.class check: build - $(JAVA) $(JAVAFLAGS) test + @$(JAVA) $(JAVAFLAGS) test + +build: + @$(JAVAC) -d . $(SOURCE_FILES) remove: $(RM) $(CLASSES) diff --git a/tests/regression/extest.java b/tests/regression/extest.java index 604fd7a2f..e5b136309 100644 --- a/tests/regression/extest.java +++ b/tests/regression/extest.java @@ -326,7 +326,7 @@ public class extest { ok(); pstacktrace(e); } catch (UnsatisfiedLinkError e) { - /* catch this one for staticvm and say it's ok */ + /* catch this one for ENABLE_STATICVM and say it's ok */ ok(); pstacktrace(e); } diff --git a/tests/regression/native/Makefile.am b/tests/regression/native/Makefile.am index 9fb5b4b4b..a36536ae6 100644 --- a/tests/regression/native/Makefile.am +++ b/tests/regression/native/Makefile.am @@ -1,4 +1,4 @@ -## src/tests/native/Makefile.am +## src/tests/regression/native/Makefile.am ## ## Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates, ## R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, @@ -28,48 +28,47 @@ ## ## Changes: ## -## $Id: Makefile.am 4094 2006-01-08 19:14:17Z twisti $ +## $Id: Makefile.am 4348 2006-01-22 21:38:47Z twisti $ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir) -CLEANFILES = \ - libcheckjni.so \ - checkjni.class \ - checkjni.h \ +SOURCE_FILES = \ + checkjni.java \ + testarguments.java + +EXTRA_DIST = \ + $(SOURCE_FILES) \ + checkjni.c \ + testarguments.c \ \ - libtestarguments.so \ - testarguments.class \ - testarguments.h + checkjni.output \ + testarguments.output -JAVA = $(top_builddir)/src/cacao/cacao -JAVAH = $(top_builddir)/src/cacaoh/cacaoh +CLEANFILES = \ + *.class \ + *.h \ + *.so \ + *.thisoutput \ + *.this2output -checkall: test.tst checkjni.tst testarguments.tst +TESTNAMES = \ + checkjni \ + testarguments -test: - $(JAVAC) test.java - $(JAVAH) test - $(CC) -shared $(INCLUDES) $(CFLAGS) test.c -o libtest.so -fPIC +JAVA = $(top_builddir)/src/cacao/cacao +JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/vm.zip:$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) -Djava.library.path=. +JAVAH = $(top_builddir)/src/cacaoh/cacaoh -checkjni: - $(JAVAC) checkjni.java - $(JAVAH) checkjni - $(CC) -shared $(INCLUDES) $(CFLAGS) checkjni.c -o libcheckjni.so -fPIC +check: $(TESTNAMES) -testarguments: - $(JAVAC) testarguments.java - $(JAVAH) testarguments - $(CC) -shared $(INCLUDES) $(CFLAGS) testarguments.c -o libtestarguments.so -fPIC - $(JAVAC) testgetobjectclass0.java - $(JAVAH) testgetobjectclass0 - $(CC) -shared $(INCLUDES) $(CFLAGS) testgetobjectclass0.c -o libtestgetobjectclass0.so -fPIC +$(TESTNAMES): + @$(JAVAC) -d . $(srcdir)/$@.java + @$(JAVAH) $@ + @$(CC) -shared $(AM_CPPFLAGS) $(CFLAGS) $(srcdir)/$@.c -o lib$@.so -fPIC + @$(SHELL) $(srcdir)/../Test.sh "$(JAVA) $(JAVAFLAGS)" $@ $(srcdir) -%.tst: % - sh ../Test.sh $(JAVA) $* - rm -f $*.thisoutput - rm -f $*.this2output ## Local variables: ## mode: Makefile diff --git a/tests/regression/native/testarguments.output b/tests/regression/native/testarguments.output index 7ecb9f2ed..02e03ed53 100644 --- a/tests/regression/native/testarguments.output +++ b/tests/regression/native/testarguments.output @@ -1,19 +1,19 @@ testing int -------------------------------------------------- -java-java : -1155484576 -723955400 1033096058 -1690734402 -1557280266 1327362106 -1930858313 502539523 -1728529858 -938301587 1431162155 1085665355 1654374947 -1661998771 -65105105 -java-native: -1155484576 -723955400 1033096058 -1690734402 -1557280266 1327362106 -1930858313 502539523 -1728529858 -938301587 1431162155 1085665355 1654374947 -1661998771 -65105105 -native-java: -1155484576 -723955400 1033096058 -1690734402 -1557280266 1327362106 -1930858313 502539523 -1728529858 -938301587 1431162155 1085665355 1654374947 -1661998771 -65105105 +java-java : 0x11111111 0x22222222 0x33333333 0x44444444 0x55555555 0x66666666 0x77777777 0x88888888 0x99999999 0xaaaaaaaa 0xbbbbbbbb 0xcccccccc 0xdddddddd 0xeeeeeeee 0xffffffff +java-native: 0x11111111 0x22222222 0x33333333 0x44444444 0x55555555 0x66666666 0x77777777 0x88888888 0x99999999 0xaaaaaaaa 0xbbbbbbbb 0xcccccccc 0xdddddddd 0xeeeeeeee 0xffffffff +native-java: 0x11111111 0x22222222 0x33333333 0x44444444 0x55555555 0x66666666 0x77777777 0x88888888 0x99999999 0xaaaaaaaa 0xbbbbbbbb 0xcccccccc 0xdddddddd 0xeeeeeeee 0xffffffff testing long ------------------------------------------------- -java-java : -316923953663567096 425784808157066482 3246199166113899023 5772649832669734744 6787954838522539928 -5438565800896958689 25579809655956232 170168523965373507 -8062155292093192501 4664870386390374308 5274012497411174555 275355961613117157 -429849028627267071 -5751058041584006506 -2440897930508784356 -java-native: -316923953663567096 425784808157066482 3246199166113899023 5772649832669734744 6787954838522539928 -5438565800896958689 25579809655956232 170168523965373507 -8062155292093192501 4664870386390374308 5274012497411174555 275355961613117157 -429849028627267071 -5751058041584006506 -2440897930508784356 -native-java: -316923953663567096 425784808157066482 3246199166113899023 5772649832669734744 6787954838522539928 -5438565800896958689 25579809655956232 170168523965373507 -8062155292093192501 4664870386390374308 5274012497411174555 275355961613117157 -429849028627267071 -5751058041584006506 -2440897930508784356 +java-java : 0x1111111111111111 0x2222222222222222 0x3333333333333333 0x4444444444444444 0x5555555555555555 0x6666666666666666 0x7777777777777777 0x8888888888888888 0x9999999999999999 0xaaaaaaaaaaaaaaaa 0xbbbbbbbbbbbbbbbb 0xcccccccccccccccc 0xdddddddddddddddd 0xeeeeeeeeeeeeeeee 0xffffffffffffffff +java-native: 0x1111111111111111 0x2222222222222222 0x3333333333333333 0x4444444444444444 0x5555555555555555 0x6666666666666666 0x7777777777777777 0x8888888888888888 0x9999999999999999 0xaaaaaaaaaaaaaaaa 0xbbbbbbbbbbbbbbbb 0xcccccccccccccccc 0xdddddddddddddddd 0xeeeeeeeeeeeeeeee 0xffffffffffffffff +native-java: 0x1111111111111111 0x2222222222222222 0x3333333333333333 0x4444444444444444 0x5555555555555555 0x6666666666666666 0x7777777777777777 0x8888888888888888 0x9999999999999999 0xaaaaaaaaaaaaaaaa 0xbbbbbbbbbbbbbbbb 0xcccccccccccccccc 0xdddddddddddddddd 0xeeeeeeeeeeeeeeee 0xffffffffffffffff testing float ------------------------------------------------ -java-java : 0.9809451 0.73315203 0.57003427 0.81729704 0.012806594 0.8388903 0.41221774 0.5266994 0.7257748 0.89933497 0.9846741 0.1339398 0.5461274 0.08306235 0.18598962 -java-native: 0.98094511 0.73315203 0.57003427 0.81729704 0.01280659 0.83889031 0.41221774 0.52669942 0.72577482 0.89933497 0.98467410 0.13393980 0.54612738 0.08306235 0.18598962 -native-java: 0.9809451 0.73315203 0.57003427 0.81729704 0.012806594 0.8388903 0.41221774 0.5266994 0.7257748 0.89933497 0.9846741 0.1339398 0.5461274 0.08306235 0.18598962 +java-java : 0x11111111 0x22222222 0x33333333 0x44444444 0x55555555 0x66666666 0x77777777 0x88888888 0x99999999 0xaaaaaaaa 0xbbbbbbbb 0xcccccccc 0xdddddddd 0xeeeeeeee 0x7fc00000 +java-native: 0x11111111 0x22222222 0x33333333 0x44444444 0x55555555 0x66666666 0x77777777 0x88888888 0x99999999 0xaaaaaaaa 0xbbbbbbbb 0xcccccccc 0xdddddddd 0xeeeeeeee 0xffffffff +native-java: 0x11111111 0x22222222 0x33333333 0x44444444 0x55555555 0x66666666 0x77777777 0x88888888 0x99999999 0xaaaaaaaa 0xbbbbbbbb 0xcccccccc 0xdddddddd 0xeeeeeeee 0x7fc00000 testing double ----------------------------------------------- -java-java : 0.9785743401478403 0.7223571191888487 0.7150310138504744 0.14322038530059678 0.4629578184224229 0.004485602182885184 0.07149831487989411 0.34842022979166454 0.3387696535357536 0.859356551354648 0.9715469888517128 0.8657458802140383 0.6125811047098682 0.17898798452881726 0.21757041220968598 -java-native: 0.9785743401478403 0.7223571191888487 0.7150310138504744 0.1432203853005968 0.4629578184224229 0.004485602182885184 0.07149831487989411 0.3484202297916645 0.3387696535357536 0.8593565513546479 0.9715469888517128 0.8657458802140383 0.6125811047098682 0.1789879845288173 0.217570412209686 -native-java: 0.9785743401478403 0.7223571191888487 0.7150310138504744 0.14322038530059678 0.4629578184224229 0.004485602182885184 0.07149831487989411 0.34842022979166454 0.3387696535357536 0.859356551354648 0.9715469888517128 0.8657458802140383 0.6125811047098682 0.17898798452881726 0.21757041220968598 +java-java : 0x1111111111111111 0x2222222222222222 0x3333333333333333 0x4444444444444444 0x5555555555555555 0x6666666666666666 0x7777777777777777 0x8888888888888888 0x9999999999999999 0xaaaaaaaaaaaaaaaa 0xbbbbbbbbbbbbbbbb 0xcccccccccccccccc 0xdddddddddddddddd 0xeeeeeeeeeeeeeeee 0x7ff8000000000000 +java-native: 0x1111111111111111 0x2222222222222222 0x3333333333333333 0x4444444444444444 0x5555555555555555 0x6666666666666666 0x7777777777777777 0x8888888888888888 0x9999999999999999 0xaaaaaaaaaaaaaaaa 0xbbbbbbbbbbbbbbbb 0xcccccccccccccccc 0xdddddddddddddddd 0xeeeeeeeeeeeeeeee 0xffffffffffffffff +native-java: 0x1111111111111111 0x2222222222222222 0x3333333333333333 0x4444444444444444 0x5555555555555555 0x6666666666666666 0x7777777777777777 0x8888888888888888 0x9999999999999999 0xaaaaaaaaaaaaaaaa 0xbbbbbbbbbbbbbbbb 0xcccccccccccccccc 0xdddddddddddddddd 0xeeeeeeeeeeeeeeee 0x7ff8000000000000 -- 2.25.1