Merge pull request #924 from iskiselev/MonoTests

Mono tests
sq · Dec 5, 2015 · 211e83b · 211e83b
2 parents b82c272 + b92048d
commit 211e83b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,9 +30,9 @@ after_script:
   - export MKDIR_COMMAND="curl -H \"Authorization:OAuth $JSIL_STORAGE_KEY\" -L -X MKCOL \"https://webdav.yandex.com/JSIL/_\""  
   - true && [ "$JSIL_STORAGE_KEY" ] && eval ${MKDIR_COMMAND/_/$BUILD_TAG}
   - true && [ "$JSIL_STORAGE_KEY" ] && eval ${MKDIR_COMMAND/_/$CACHE_PATH}
-  - true && [ "$JSIL_STORAGE_KEY" ] && zip -3 -r - /tmp/JSIL_Tests | eval ${UPLOAD_COMMAND/_/$CACHE_PATH/compilecache.zip}
-  - true && [ "$JSIL_STORAGE_KEY" ] && [ ! "$SKIP_BINARIES" ] && zip -3 -r - bin Libraries | eval ${UPLOAD_COMMAND/_/$CACHE_PATH/binaries.zip}
-  - true && [ "$JSIL_STORAGE_KEY" ] && zip -3 -r - -@ Libraries test_runner.html < <(find . -name *.out) | eval ${UPLOAD_COMMAND/_/$CACHE_PATH/tests.zip}
+  - true && [ "$JSIL_STORAGE_KEY" ] && zip -3 -r -q - /tmp/JSIL_Tests | eval ${UPLOAD_COMMAND/_/$CACHE_PATH/compilecache.zip}
+  - true && [ "$JSIL_STORAGE_KEY" ] && [ ! "$SKIP_BINARIES" ] && zip -3 -r -q - bin Libraries | eval ${UPLOAD_COMMAND/_/$CACHE_PATH/binaries.zip}
+  - true && [ "$JSIL_STORAGE_KEY" ] && zip -3 -r -q - -@ Libraries test_runner.html < <(find . -name *.out) | eval ${UPLOAD_COMMAND/_/$CACHE_PATH/tests.zip}
 
 env:
   global:

diff --git a/JSIL/AssemblyTranslator.cs b/JSIL/AssemblyTranslator.cs
@@ -272,7 +272,7 @@ struct MethodToAnalyze {
 
         protected ParallelOptions GetParallelOptions () {
             return new ParallelOptions {
-                MaxDegreeOfParallelism = Configuration.UseThreads.GetValueOrDefault(true) 
+                MaxDegreeOfParallelism = Configuration.UseThreads.GetValueOrDefault(false) 
                     ? (Environment.ProcessorCount + 2) 
                     : 1
             };
@@ -557,7 +557,7 @@ struct MethodToAnalyze {
                 pr.OnProgressChanged(result.Assemblies.Count, assemblies.Length);
             };
 
-            if (Configuration.UseThreads.GetValueOrDefault(true)) {
+            if (Configuration.UseThreads.GetValueOrDefault(false)) {
                 Parallel.For(
                     0, assemblies.Length, parallelOptions, writeAssembly
                 );
@@ -736,7 +736,7 @@ struct MethodToAnalyze {
                 return ctx;
             };
 
-            if (Configuration.UseThreads.GetValueOrDefault(true)) {
+            if (Configuration.UseThreads.GetValueOrDefault(false)) {
                 Parallel.For(
                     0, methodsToAnalyze.Count, parallelOptions,
                     () => MakeDecompilerContext(assemblies[0].MainModule),

diff --git a/...ses/FailsOnMonoWhenStubbed/ConvertEnum.cs → Tests/SimpleTestCases/ConvertEnum.cs b/...ses/FailsOnMonoWhenStubbed/ConvertEnum.cs → Tests/SimpleTestCases/ConvertEnum.cs
diff --git a/...ailsOnMonoWhenStubbed/EnumIConvertible.cs → Tests/SimpleTestCases/EnumIConvertible.cs b/...ailsOnMonoWhenStubbed/EnumIConvertible.cs → Tests/SimpleTestCases/EnumIConvertible.cs
diff --git a/...impleTestCases/DelegateMethod_Issue604.cs → ...es/FailsOnMono/DelegateMethod_Issue604.cs b/...impleTestCases/DelegateMethod_Issue604.cs → ...es/FailsOnMono/DelegateMethod_Issue604.cs
diff --git a/Tests/SimpleTestCases/DelegateRemove.cs → ...leTestCases/FailsOnMono/DelegateRemove.cs b/Tests/SimpleTestCases/DelegateRemove.cs → ...leTestCases/FailsOnMono/DelegateRemove.cs
diff --git a/...egateRemoveAdvancedWithLambda_Issue541.cs → ...egateRemoveAdvancedWithLambda_Issue541.cs b/...egateRemoveAdvancedWithLambda_Issue541.cs → ...egateRemoveAdvancedWithLambda_Issue541.cs
diff --git a/Tests/SimpleTests.csproj b/Tests/SimpleTests.csproj
@@ -69,12 +69,12 @@
     <None Include="SimpleTestCases\Issue538.cs" />
     <None Include="SimpleTestCases\Issue567.cs" />
     <None Include="SimpleTestCasesForStubbedBcl\Issue585.cs" />
-    <None Include="SimpleTestCases\FailsOnMonoWhenStubbed\ConvertEnum.cs" />
+    <None Include="SimpleTestCases\ConvertEnum.cs" />
     <None Include="SimpleTestCases\DelegateBaseType_Issue449.cs" />
     <None Include="SimpleTestCases\DelegateInvoke_Issue500.cs" />
     <None Include="SimpleTestCases\DelegateInvoke_Issue543.cs" />
     <None Include="SimpleTestCases\DelegateReflection_Issue500.cs" />
-    <None Include="SimpleTestCases\DelegateMethod_Issue604.cs" />
+    <None Include="SimpleTestCases\FailsOnMono\DelegateMethod_Issue604.cs" />
     <None Include="ExpressionTestCases\ExpressionsExecution.cs" />
     <None Include="SimpleTestCases\CharArithmetic_Issue610.cs" />
     <None Include="SimpleTestCasesForStubbedBcl\Issue578.cs" />
@@ -170,7 +170,7 @@
     <None Include="SimpleTestCases\InterfaceBaseType.cs" />
     <None Include="SimpleTestCases\ArrayCopyEnum.cs" />
     <None Include="SimpleTestCases\StringGetHashCode.cs" />
-    <None Include="SimpleTestCases\FailsOnMonoWhenStubbed\EnumIConvertible.cs" />
+    <None Include="SimpleTestCases\EnumIConvertible.cs" />
     <None Include="SimpleTestCases\GetEntryAssembly.cs" />
     <None Include="SimpleTestCases\CastEnumTypeToRuntimeType.cs" />
     <None Include="SimpleTestCases\CastIntegerConstantToEnum.cs" />
@@ -308,7 +308,7 @@
     <None Include="SimpleTestCases\FloatArrayInitializer.cs" />
     <None Include="SimpleTestCases\StaticConstructorAndFieldAccess.cs" />
     <None Include="SimpleTestCases\StaticConstructorAndFieldAccess2.cs" />
-    <None Include="SimpleTestCases\DelegateRemove.cs" />
+    <None Include="SimpleTestCases\FailsOnMono\DelegateRemove.cs" />
     <None Include="SimpleTestCases\DelegateRemoveAdvanced.cs" />
     <None Include="SimpleTestCases\DecimalCast.cs" />
     <None Include="SimpleTestCases\DecimalCopy.cs" />
@@ -457,7 +457,7 @@
     <None Include="SimpleTestCases\Issue504_2.cs" />
     <None Include="SimpleTestCases\Issue504_3.cs" />
     <None Include="SimpleTestCases\HelloWorld.cpp" />
-    <None Include="SimpleTestCases\DelegateRemoveAdvancedWithLambda_Issue541.cs" />
+    <None Include="SimpleTestCases\FailsOnMono\DelegateRemoveAdvancedWithLambda_Issue541.cs" />
     <None Include="SimpleTestCases\LambdaInStateMachine1_Issue544.cs" />
     <None Include="SimpleTestCases\LambdaInStateMachine2_Issue544.cs" />
     <None Include="SimpleTestCases\HelloWorld.il" />
@@ -495,6 +495,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="SimpleTestCases\FailsOnMonoWhenStubbed\" />
     <Folder Include="TranslatedBcl\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />