dev 1.0.172 → 1.0.173
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Paths.rb +15 -3
- data/lib/dev/cmd/Test.rb +7 -2
- metadata +1 -1
data/lib/dev/Paths.rb
CHANGED
@@ -14,6 +14,7 @@ class Paths < Hash
|
|
14
14
|
|
15
15
|
def initialize_nunit
|
16
16
|
nunit=""
|
17
|
+
nunitx86=""
|
17
18
|
nunit_bin=""
|
18
19
|
Dir.glob("#{Rake.original_dir()}/**/*.csproj").each { |f|
|
19
20
|
text=File.read(f)
|
@@ -22,22 +23,33 @@ class Paths < Hash
|
|
22
23
|
}
|
23
24
|
}
|
24
25
|
|
25
|
-
|
26
|
+
nunit="#{nunit_bin}/bin/nunit-console.exe" if nunit_bin.length > 3
|
27
|
+
nunitx86="#{nunit_bin}/bin/nunit-console-x86.exe" if nunit_bin.length > 3
|
26
28
|
|
27
29
|
if nunit.length==0
|
28
30
|
["2.6.0.12051","2.5.10.11092"].each{ |v|
|
29
|
-
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console
|
31
|
+
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console.exe").each{|f|
|
30
32
|
nunit=f if File.exists?(f) && self[:nunit].nil?
|
31
33
|
}
|
32
34
|
if( !self.has_key?(:nunit) )
|
33
|
-
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console
|
35
|
+
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console.exe").each{|f|
|
34
36
|
self[:nunit]=f if File.exists?(f) && self[:nunit].nil?
|
35
37
|
}
|
36
38
|
end
|
39
|
+
|
40
|
+
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console-x86.exe").each{|f|
|
41
|
+
nunitx86=f if File.exists?(f) && self[:nunitx86].nil?
|
42
|
+
}
|
43
|
+
if( !self.has_key?(:nunit) )
|
44
|
+
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console-x86.exe").each{|f|
|
45
|
+
self[:nunitx86]=f if File.exists?(f) && self[:nunitx86].nil?
|
46
|
+
}
|
47
|
+
end
|
37
48
|
}
|
38
49
|
end
|
39
50
|
|
40
51
|
self[:nunit]=nunit
|
52
|
+
self[:nunitx86]=nunitx86
|
41
53
|
end
|
42
54
|
end # class Paths
|
43
55
|
end # module Dev
|
data/lib/dev/cmd/Test.rb
CHANGED
@@ -17,8 +17,13 @@ class Test < Array
|
|
17
17
|
platforms=Dev::MsBuild.extract_platforms(cs)
|
18
18
|
platforms.each { |platform|
|
19
19
|
dll_name="#{DEV[:directory]}/bin/#{platform}/Release/#{File.basename(cs,'.csproj')}.dll"
|
20
|
-
|
21
|
-
|
20
|
+
if platform=="x86"
|
21
|
+
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")
|
22
|
+
self << "{:cmd-> 'mono <paths,nunitx86> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
|
23
|
+
else
|
24
|
+
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")
|
25
|
+
self << "{:cmd-> 'mono <paths,nunit> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
|
26
|
+
end
|
22
27
|
}
|
23
28
|
}
|
24
29
|
|