dev 1.0.172 → 1.0.173

data/lib/dev/Paths.rb

@@ -14,6 +14,7 @@ class Paths < Hash
 
   def initialize_nunit
     nunit=""
+	nunitx86=""
     nunit_bin=""
     Dir.glob("#{Rake.original_dir()}/**/*.csproj").each { |f|
 	  text=File.read(f)
@@ -22,22 +23,33 @@ class Paths < Hash
 	  }
 	}
 
-    nunit="#{nunit_bin}/bin/nunit-console-x86.exe" if nunit_bin.length > 3
+	nunit="#{nunit_bin}/bin/nunit-console.exe" if nunit_bin.length > 3
+	nunitx86="#{nunit_bin}/bin/nunit-console-x86.exe" if nunit_bin.length > 3
 
 	if nunit.length==0
 	  ["2.6.0.12051","2.5.10.11092"].each{ |v|
-	    Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console-x86.exe").each{|f|
+	    Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console.exe").each{|f|
 	      nunit=f if File.exists?(f) && self[:nunit].nil?
 	    }
 	    if( !self.has_key?(:nunit) )
-	      Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console-x86.exe").each{|f|
+	      Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console.exe").each{|f|
 	        self[:nunit]=f if File.exists?(f) && self[:nunit].nil?
 	      }
 	    end
+
+	    Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console-x86.exe").each{|f|
+	      nunitx86=f if File.exists?(f) && self[:nunitx86].nil?
+	    }
+	    if( !self.has_key?(:nunit) )
+	      Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console-x86.exe").each{|f|
+	        self[:nunitx86]=f if File.exists?(f) && self[:nunitx86].nil?
+	      }
+	    end
 	  }
 	end
 
 	self[:nunit]=nunit
+	self[:nunitx86]=nunitx86
   end
 end # class Paths
 end # module Dev

data/lib/dev/cmd/Test.rb

@@ -17,8 +17,13 @@ class Test < Array
 	  platforms=Dev::MsBuild.extract_platforms(cs)
 	  platforms.each { |platform|
 	    dll_name="#{DEV[:directory]}/bin/#{platform}/Release/#{File.basename(cs,'.csproj')}.dll"
-        self << "{:cmd=> '<paths,nunit> /xml:#{dll_name}.nunit-results.xml #{dll_name}', :auto=>true, :capture_output=>true, :capture_error=>true}" if RUBY_PLATFORM.include?("w32")
-		self << "{:cmd-> 'mono <paths,nunit> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
+		if platform=="x86"
+          self << "{:cmd=> '<paths,nunitx86> /xml:#{dll_name}.nunit-results.xml #{dll_name}', :auto=>true, :capture_output=>true, :capture_error=>true}" if RUBY_PLATFORM.include?("w32")
+		  self << "{:cmd-> 'mono <paths,nunitx86> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
+		else
+		  self << "{:cmd=> '<paths,nunit> /xml:#{dll_name}.nunit-results.xml #{dll_name}', :auto=>true, :capture_output=>true, :capture_error=>true}" if RUBY_PLATFORM.include?("w32")
+		  self << "{:cmd-> 'mono <paths,nunit> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
+		end
 	  }  
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.172
+  version: 1.0.173
   prerelease: 
 platform: ruby
 authors: