Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tiny fix in reloading tests development
authorMarcel Hlopko <marcel.hlopko@gmail.com>
Tue, 01 Oct 2013 23:06:23 +0200
branchdevelopment
changeset 2756 6659925a80a4
parent 2755 2158564a90d1
child 2757 66f842986836
tiny fix in reloading tests
experiments/JavaClassReloaderTests.st file | annotate | diff | comparison | revisions
experiments/JavaSingleClassReloaderTests.st file | annotate | diff | comparison | revisions
experiments/Make.proto file | annotate | diff | comparison | revisions
experiments/bc.mak file | annotate | diff | comparison | revisions
experiments/experiments.rc file | annotate | diff | comparison | revisions 
--- a/experiments/JavaClassReloaderTests.st	Tue Oct 01 22:58:12 2013 +0200
+++ b/experiments/JavaClassReloaderTests.st	Tue Oct 01 23:06:23 2013 +0200
@@ -68,6 +68,8 @@
 history
 
     "Created: #resources / 21-12-2012 / 18:09:27 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: #setUp / 01-10-2013 / 22:59:07 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: #tearDown / 01-10-2013 / 22:59:11 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 ! !
 
 !JavaClassReloaderTests class methodsFor:'resources'!
@@ -154,12 +156,14 @@
     testClassLoader := JAVA java lang ClassLoader new.
 
     "Created: / 16-12-2012 / 16:32:32 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: / 01-10-2013 / 22:59:07 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 tearDown
     JavaVM registry unregisterClassLoader: testClassLoader.
 
     "Created: / 16-12-2012 / 16:33:31 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: / 01-10-2013 / 22:59:11 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 ! !
 
 !JavaClassReloaderTests methodsFor:'test helpers'!
--- a/experiments/JavaSingleClassReloaderTests.st	Tue Oct 01 22:58:12 2013 +0200
+++ b/experiments/JavaSingleClassReloaderTests.st	Tue Oct 01 23:06:23 2013 +0200
@@ -159,15 +159,16 @@
 }'.
     self assert: jclass1 ~~ jclass2.
     self assert: jclass1 fields size == 1.
-    self assert: jclass1 fields anElement descriptor = 'I'.
+    self assert: jclass1 fields anElement descriptor = 'Ljava/lang/Object;'.
     self assert: jinst1 bar == 1.
     self assert: jclass2 fields size == 1.
-    self assert: jclass2 fields anElement descriptor = 'Ljava/lang/Object;'.
+    self assert: jclass2 fields anElement descriptor = 'I'.
     self assert: jinst2 bar == 2.
     self should: [ callerClass getFoo: jinst1 ] raise: Error.
     self shouldnt: [ callerClass getFoo: jinst2 ] raise: Error.
 
     "Created: / 20-09-2013 / 00:05:59 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: / 01-10-2013 / 22:05:28 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 test_fields_01a
--- a/experiments/Make.proto	Tue Oct 01 22:58:12 2013 +0200
+++ b/experiments/Make.proto	Tue Oct 01 23:06:23 2013 +0200
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libjava/tools
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit
 
 
 # if you need any additional defines for embedded C code,
@@ -134,20 +134,12 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../tools && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
--- a/experiments/bc.mak	Tue Oct 01 22:58:12 2013 +0200
+++ b/experiments/bc.mak	Tue Oct 01 23:06:23 2013 +0200
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libjava\tools
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -51,20 +51,12 @@
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
 	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\tools & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
--- a/experiments/experiments.rc	Tue Oct 01 22:58:12 2013 +0200
+++ b/experiments/experiments.rc	Tue Oct 01 23:06:23 2013 +0200
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2013\nCopyright eXept Software AG 1998-2013\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 19 Sep 2013 22:08:49 GMT\0"
+      VALUE "ProductDate", "Tue, 01 Oct 2013 21:01:48 GMT\0"
     END
 
   END
hg/stx-libjava