Skip to content

Commit

Permalink
fixed z3 unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@HJLebbink
HJLebbink committed Oct 27, 2019
1 parent a47bc55 commit 1037289
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 46 deletions.
11 changes: 4 additions & 7 deletions VS/CSHARP/asm-dude-vsix/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,16 +391,13 @@
<setting name="AsmSim_Show_Register_In_Register_Tooltip" serializeAs="String">
<value>True</value>
</setting>
<setting name="AsmSim_Show_Register_In_Code_Completion_Numeration"
serializeAs="String">
<setting name="AsmSim_Show_Register_In_Code_Completion_Numeration" serializeAs="String">
<value>HEX</value>
</setting>
<setting name="AsmSim_Show_Register_In_Instruction_Tooltip_Numeration"
serializeAs="String">
<setting name="AsmSim_Show_Register_In_Instruction_Tooltip_Numeration" serializeAs="String">
<value>HEX</value>
</setting>
<setting name="AsmSim_Show_Register_In_Register_Tooltip_Numeration"
serializeAs="String">
<setting name="AsmSim_Show_Register_In_Register_Tooltip_Numeration" serializeAs="String">
<value>HEX</value>
</setting>
<setting name="ARCH_AVX512_VBMI2" serializeAs="String">
Expand Down Expand Up @@ -483,5 +480,5 @@
</setting>
</AsmDude.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
</configuration>
4 changes: 2 additions & 2 deletions VS/CSHARP/asm-dude-vsix/asm-dude-vsix.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<AssemblyName>AsmDude</AssemblyName>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<GeneratePkgDefFile>true</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
Expand Down Expand Up @@ -417,7 +417,7 @@
<Version>1.2.0-beta2</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.Composition">
<Version>4.6.0</Version>
<Version>4.7.0-preview1.19504.10</Version>
</PackageReference>
<PackageReference Include="System.Drawing.Primitives">
<Version>4.3.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion VS/CSHARP/asm-sim-lib/asm-sim-lib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AsmSim</RootNamespace>
<AssemblyName>asm-sim-lib</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand Down
2 changes: 1 addition & 1 deletion VS/CSHARP/asm-sim-main/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
4 changes: 2 additions & 2 deletions VS/CSHARP/asm-sim-main/asm-sim-main.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>asm_sim_main</RootNamespace>
<AssemblyName>asm-sim-main</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -122,7 +122,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Drawing.Common">
<Version>4.6.0</Version>
<Version>4.7.0-preview1.19504.10</Version>
</PackageReference>
<PackageReference Include="System.Runtime">
<Version>4.3.1</Version>
Expand Down
2 changes: 1 addition & 1 deletion VS/CSHARP/asm-tools-lib/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
2 changes: 1 addition & 1 deletion VS/CSHARP/asm-tools-lib/asm-tools-lib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AsmTools</RootNamespace>
<AssemblyName>asm-tools-lib</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion VS/CSHARP/unit-tests-asm-dude/unit-tests-asm-dude.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>unit_tests</RootNamespace>
<AssemblyName>unit-tests</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
8 changes: 6 additions & 2 deletions VS/CSHARP/unit-tests-asm-sim/Test_Mnemonic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3843,7 +3843,7 @@ public void Test_MnemonicZ3_PushPop_64bit_2()
[TestMethod]
public void Test_MnemonicZ3_PushPop_64bit_3()
{
Tools tools = this.CreateTools(10000); // 1000=10sec
Tools tools = this.CreateTools(40000); // 10000=10sec
tools.StateConfig.Set_All_Off();
tools.StateConfig.RAX = true;
tools.StateConfig.RBX = true;
Expand All @@ -3857,6 +3857,10 @@ public void Test_MnemonicZ3_PushPop_64bit_3()
State state = this.CreateState(tools);

state = Runner.SimpleStep_Forward(line1, state);
if (LogToDisplay)
{
Console.WriteLine("After \"" + line1 + "\", we know:\n" + state);
}
AsmTestTools.AreUnrelated(Rn.RAX, Rn.RBX, state);

state = Runner.SimpleStep_Forward(line2, state);
Expand All @@ -3872,7 +3876,7 @@ public void Test_MnemonicZ3_PushPop_64bit_3()
[TestMethod]
public void Test_MnemonicZ3_PushPop_64bit_4()
{
Tools tools = this.CreateTools();
Tools tools = this.CreateTools(40000);
tools.StateConfig.Set_All_Off();
tools.StateConfig.RAX = true;
tools.StateConfig.RBX = true;
Expand Down
14 changes: 1 addition & 13 deletions VS/CSHARP/unit-tests-asm-sim/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,10 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
Expand All @@ -26,10 +18,6 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
Expand Down Expand Up @@ -72,4 +60,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
2 changes: 1 addition & 1 deletion VS/CSHARP/unit-tests-asm-sim/unit-tests-asm-sim.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>unit_tests_asm_z3</RootNamespace>
<AssemblyName>unit-tests-asm-z3</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
14 changes: 1 addition & 13 deletions VS/CSHARP/unit-tests-asm-tools/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,10 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
Expand All @@ -26,10 +18,6 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
Expand Down Expand Up @@ -72,4 +60,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
3 changes: 2 additions & 1 deletion VS/CSHARP/unit-tests-asm-tools/unit-tests-asm-tools.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>unit_tests_asm_tools</RootNamespace>
<AssemblyName>unit_tests_asm_tools</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand All @@ -34,6 +34,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
Expand Down

0 comments on commit 1037289

Please sign in to comment.