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.
Fixes for Mauve tests jk_new_structure
authorvranyj1
Wed, 28 Mar 2012 14:03:25 +0000
branchjk_new_structure
changeset 1433 cc7b8e8cd814
parent 1432 a36d964be591
child 1434 ea72997fdf11
Fixes for Mauve tests
src/JavaTestsLoader.st file | annotate | diff | comparison | revisions
src/JavaTestsResource.st file | annotate | diff | comparison | revisions
src/JavaVM.st file | annotate | diff | comparison | revisions
src/Make.proto file | annotate | diff | comparison | revisions
src/Make.spec file | annotate | diff | comparison | revisions
src/bc.mak file | annotate | diff | comparison | revisions
src/libjava.rc file | annotate | diff | comparison | revisions
src/stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/src/JavaTestsLoader.st	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/JavaTestsLoader.st	Wed Mar 28 14:03:25 2012 +0000
@@ -57,8 +57,7 @@
 
 buildSuiteForLibjava
 
-    ^self buildSuiteFrom: 
-        (self loadLibjava)
+    ^(self buildSuiteFrom: (self loadLibjava)) name: 'stx:libjava Test Suite'
 
     "
         JavaTestsLoader buildSuiteForLibjava
@@ -69,7 +68,7 @@
 
 buildSuiteForMauve
 
-    ^self buildSuiteFrom: (self loadMauve)
+    ^(self buildSuiteFrom: (self loadMauve)) name: 'Mauve Test Suite'
 
     "
         JavaTestsLoader buildSuiteForMauve
--- a/src/JavaTestsResource.st	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/JavaTestsResource.st	Wed Mar 28 14:03:25 2012 +0000
@@ -60,19 +60,22 @@
 
     cp := OrderedCollection new.
     self antProjectDir 
-        directoryContentsDo:[:dir | cp := cp , (self classpathFor:dir) ].
+        directoryContentsDo:[:dir | 
+            (self shouldIncludeProject: dir) ifTrue:[
+                cp := cp , (self classpathFor:dir)
+            ]].
     ^ cp
 
     "
         JavaTestsResource classpath"
+
     "Created: / 07-05-2011 / 18:15:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-06-2011 / 16:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 28-03-2012 / 12:28:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 classpathFor:testProject 
     |cp dir|
 
-    (self shouldIncludeProject: testProject) ifFalse:[ ^ #() ].
     cp := OrderedCollection new.
     dir := self antProjectDir / testProject.
     dir isDirectory 
@@ -104,7 +107,9 @@
     ^ self classpathFor:'libjava-mauve'
 
     "
-        JavaTestsResource testsClasspathForMauve"
+        JavaTestsResource classpathForMauve
+    "
+
     "Created: / 11-06-2011 / 15:59:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
--- a/src/JavaVM.st	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/JavaVM.st	Wed Mar 28 14:03:25 2012 +0000
@@ -15622,6 +15622,18 @@
     "Modified: / 18-10-2011 / 20:33:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+_sun_misc_Unsafe_getIntVolatile: nativeContext
+
+    <javanative: 'sun/misc/Unsafe' name: 'getIntVolatile(Ljava/lang/Object;J)I'>
+
+    | o offset |
+    o := nativeContext argAt: 1.
+    offset := nativeContext argAt: 2.
+    ^o instVarAt: offset
+
+    "Modified: / 28-03-2012 / 15:03:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 _sun_misc_Unsafe_getLongVolatile: nativeContext
 
     <javanative: 'sun/misc/Unsafe' name: 'getLongVolatile(Ljava/lang/Object;J)J'>
--- a/src/Make.proto	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/Make.proto	Wed Mar 28 14:03:25 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-03-19 15:31:06.256.
+# automagically generated from the projectDefinition: stx_libjava at 2012-03-28 12:30:19.626.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -87,7 +87,7 @@
 
 stx_libjava.o: stx_libjava.st .svnversion 
 	if [ -d .svn ]; then \
-		rev2=$(shell svnversion -n); \
+		rev2=$(shell cat .svnversion); \
 		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"$$rev2\"\$$\"/g" $< > .stx_libjava.svn.st; \
 	fi
 	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava.svn $(O_RULE);
@@ -111,7 +111,6 @@
 
 prereq: $(REQUIRED_SUPPORT_DIRS)
 	cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/src/Make.spec	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/Make.spec	Wed Mar 28 14:03:25 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-03-19 15:31:03.407.
+# automagically generated from the projectDefinition: stx_libjava at 2012-03-28 12:30:18.346.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/bc.mak	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/bc.mak	Wed Mar 28 14:03:25 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-03-19 15:31:06.945.
+# automagically generated from the projectDefinition: stx_libjava at 2012-03-28 12:30:20.343.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -51,7 +51,6 @@
 # build all prerequisite packages 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 ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/src/libjava.rc	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/libjava.rc	Wed Mar 28 14:03:25 2012 +0000
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Mon, 19 Mar 2012 15:31:29 GMT\0"
+      VALUE "ProductDate", "Wed, 28 Mar 2012 11:30:32 GMT\0"
     END
 
   END
--- a/src/stx_libjava.st	Wed Mar 28 11:29:45 2012 +0000
+++ b/src/stx_libjava.st	Wed Mar 28 14:03:25 2012 +0000
@@ -160,17 +160,17 @@
 
     ^ #(
         #'squeak:petitparser'
-        #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
-        #'stx:libbasic'    "Integer - superclass of JavaShort "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaTestsResource "
+        #'stx:libbasic'    "Behavior - superclass of GroovyClass "
         #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
-        #'stx:libbasic3'    "MessageTracer - referenced by JavaMethod>>setBreakPoint "
-        #'stx:libcomp'    "Parser - referenced by GroovyCompiler>>error:line:from:to: "
+        #'stx:libbasic3'    "WrappedMethod - extended "
+        #'stx:libcomp'    "ObjectFileLoader - referenced by JavaVM class>>_Runtime_loadFileInternalI: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
-        #'stx:libview'    "DisplaySurface - superclass of JavaEmbeddedFrameView "
-        #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "TextView - referenced by JavaVM class>>processEvent: "
-        #'stx:libwidg2'    "ComboBoxView - referenced by JavaVM class>>processEvent: "
+        #'stx:libview'    "GraphicsMedium - superclass of JavaPopUpView "
+        #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
+        #'stx:libwidg'    "FileSelectionBox - referenced by Java class>>javaProcessForMainOf:argumentString: "
+        #'stx:libwidg2'    "CheckBox - referenced by JavaVM class>>_WCheckboxPeer_create: "
     )
 ! !
 
@@ -393,6 +393,9 @@
         ProxyMethodJavaMethodInvocationNode
         ProxyMethodJavaTypeCheckNode
         JavaNativeMethod
+        ProxyMethodJavaFieldAccessor
+        ProxyMethodJavaFieldGetter
+        ProxyMethodJavaFieldSetter
     )
 !
 
@@ -533,6 +536,7 @@
         'WordArray class' javaArrayClass
         'WordArray class' javaComponentClass
         'WordArray class' javaName
+        'Boolean class' javaWrap:
     )
 ! !
 
@@ -611,7 +615,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"1761M"$"
+    ^ "$SVN-Revision:"'1785'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!
hg/stx-libjava