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 monitor test fix jk_new_structure
authorhlopkmar
Thu, 12 Apr 2012 13:10:36 +0000
branchjk_new_structure
changeset 1472 18de85f968bd
parent 1471 387019ab53e3
child 1473 3eecd0a2332e
tiny monitor test fix
src/JavaMonitorsTests.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 
--- a/src/JavaMonitorsTests.st	Thu Apr 12 09:57:19 2012 +0000
+++ b/src/JavaMonitorsTests.st	Thu Apr 12 13:10:36 2012 +0000
@@ -368,19 +368,17 @@
         - a __synchronized java method with that calls
         - a java method throwing RuntimeException
 
-     When first Java method returns, all monitors should be released        
-    "
+     When first Java method returns, all monitors should be released"
+    
     | javaTests |
-
     self assert: (JavaVM enteredMonitorsOfProcess: thisProcess) isEmptyOrNil.
-
     javaTests := JAVA stx libjava tests MonitorTests new.
     javaTests test_releasing_01.
-    self assert: (javaTests instVarNamed: #token) == 7.
-
+    self assert: (javaTests instVarNamed: #token) == 1101101.
     self assert: (JavaVM enteredMonitorsOfProcess: thisProcess) isEmptyOrNil.
 
     "Created: / 07-04-2012 / 08:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-04-2012 / 15:11:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 test_releasing_02
--- a/src/Make.proto	Thu Apr 12 09:57:19 2012 +0000
+++ b/src/Make.proto	Thu Apr 12 13:10:36 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-04-12 10:22:34.971.
+# automagically generated from the projectDefinition: stx_libjava at 2012-04-12 15:12:01.405.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/Make.spec	Thu Apr 12 09:57:19 2012 +0000
+++ b/src/Make.spec	Thu Apr 12 13:10:36 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-04-12 10:22:33.974.
+# automagically generated from the projectDefinition: stx_libjava at 2012-04-12 15:12:00.768.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/bc.mak	Thu Apr 12 09:57:19 2012 +0000
+++ b/src/bc.mak	Thu Apr 12 13:10:36 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-04-12 10:22:35.457.
+# automagically generated from the projectDefinition: stx_libjava at 2012-04-12 15:12:01.836.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/libjava.rc	Thu Apr 12 09:57:19 2012 +0000
+++ b/src/libjava.rc	Thu Apr 12 13:10:36 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1815,1815
+  FILEVERSION     6,2,1823,1823
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.1815.1815\0"
+      VALUE "FileVersion", "6.2.1823.1823\0"
       VALUE "InternalName", "stx:libjava\0"
       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", "Thu, 12 Apr 2012 08:22:36 GMT\0"
+      VALUE "ProductDate", "Thu, 12 Apr 2012 13:12:04 GMT\0"
     END
 
   END
hg/stx-libjava