Fix non-deterministic Rake test for "multitask" by adding semaphore.s…

…ynchronize around array access Changed default.mspec so that :core properly excludes the thread tests
shri-zz · Jun 3, 2009 · 4008955 · 4008955
1 parent 1f95df8
commit 4008955
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec b/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec
@@ -23,7 +23,7 @@ class MSpecScript
     "core\\binding",
     "core\\builtin_constants"
   ]
-  set :core2, filtered("core", "[j-z]").reject{|el| el =~ /^thread/}
+  set :core2, filtered("core", "[j-z]").reject{|el| el =~ /thread/i}
   set :lang, [
     "language"
     ]

diff --git a/Merlin/External.LCA_RESTRICTED/Languages/Ruby/RakeTests/test/test_multitask.rb b/Merlin/External.LCA_RESTRICTED/Languages/Ruby/RakeTests/test/test_multitask.rb
@@ -2,19 +2,21 @@
 
 require 'test/unit'
 require 'rake'
+require 'thread'
 
 ######################################################################
 class TestMultiTask < Test::Unit::TestCase
   include Rake
+  @@semaphore = Mutex.new
 
   def setup
     Task.clear
     @runs = Array.new
   end
 
   def test_running_multitasks
-    task :a do 3.times do |i| @runs << "A#{i}"; sleep 0.01; end end
-    task :b do 3.times do |i| @runs << "B#{i}"; sleep 0.01;  end end
+    task :a do 3.times do |i| @@semaphore.synchronize { @runs << "A#{i}" }; sleep 0.01; end end
+    task :b do 3.times do |i| @@semaphore.synchronize { @runs << "B#{i}" }; sleep 0.01; end end
     multitask :both => [:a, :b]
     Task[:both].invoke
     assert_equal 6, @runs.size

diff --git a/Merlin/Main/Languages/Ruby/Scripts/irtests.bat b/Merlin/Main/Languages/Ruby/Scripts/irtests.bat
@@ -56,6 +56,7 @@ if defined PARALLEL_IRTESTS (
 )
 
 time /t
+echo Legacy Tests
 
 if defined PARALLEL_IRTESTS (
     start "Legacy Tests" %MERLIN_ROOT%\Languages\Ruby\Tests\run.bat
@@ -67,15 +68,16 @@ if defined PARALLEL_IRTESTS (
     )
 )
 
-time /t
-
 :==============================================================================
 : RubySpecs
 
 REM We use mspec-run instead of mspec so that we can specify "-G thread" to disable the volatile thread tests
 
 set MSPEC_RUN=%MERLIN_ROOT%\..\External.LCA_RESTRICTED\Languages\IronRuby\mspec\mspec\bin\mspec-run
 
+time /t
+echo RubySpec A tests
+
 if defined PARALLEL_IRTESTS (
     start "RubySpec A tests" cmd.exe /k %MERLIN_ROOT%\bin\Debug\ir.exe %MSPEC_RUN% -G fails -G unstable -G thread -G critical -fd :lang :cli :netinterop :cominterop :thread
 ) else (
@@ -87,6 +89,7 @@ if defined PARALLEL_IRTESTS (
 )
 
 time /t
+echo RubySpec B tests
 
 if defined PARALLEL_IRTESTS (
     start "RubySpec B tests" mspec ci -fd -V :core1 :lib1 
@@ -99,6 +102,7 @@ if defined PARALLEL_IRTESTS (
 )
 
 time /t
+echo RubySpec C tests
 
 if defined PARALLEL_IRTESTS (
     start "RubySpec C tests" mspec ci -fd -V :core2 :lib2

diff --git a/Merlin/Users/sborde/Dev.bat b/Merlin/Users/sborde/Dev.bat
@@ -13,4 +13,9 @@ REM but mspec launches mspec-run as a separate process
 set RUBY_EXE=%MERLIN_ROOT%\bin\Debug\ir.exe
 set RUBY19_EXE=%MERLIN_TFS%\..\External.LCA_RESTRICTED\Languages\Ruby\ruby-1.9.1p0\bin\ruby.exe
 
+REM Set GEM_HOME so that "gem install" will install to a different location, and not in source tree
+REM Note that GEM_PATH points to the gems included in the source tree.
+set GEM_HOME=%TEMP%\gems
+set GEM_PATH=%GEM_PATH%;%GEM_HOME%
+
 set JAVA_HOME=C:\Progra~1\Java\jre6