From e3160d95cfb337c051c8e5873055981d9b0d7aac Mon Sep 17 00:00:00 2001 From: Russ Keldorph Date: Mon, 16 May 2016 15:23:15 -0700 Subject: Rename some IL tests whose names conflicted with C# tests For catchrettoinnertry, we appeared to have some redundant test projects. I removed the redundant ones and cleaned up the remaining. Fixes #3379 --- .../eh/finallyexec/catchrettoinnertry_cs_d.csproj | 9 ++-- .../eh/finallyexec/catchrettoinnertry_cs_do.csproj | 7 ++- .../eh/finallyexec/catchrettoinnertry_cs_r.csproj | 11 ++--- .../eh/finallyexec/catchrettoinnertry_cs_ro.csproj | 9 ++-- .../eh/finallyexec/catchrettoinnertry_d.csproj | 53 ---------------------- .../eh/finallyexec/catchrettoinnertry_d.ilproj | 3 ++ .../eh/finallyexec/catchrettoinnertry_do.csproj | 53 ---------------------- .../eh/finallyexec/catchrettoinnertry_r.csproj | 53 ---------------------- .../eh/finallyexec/catchrettoinnertry_r.ilproj | 4 ++ .../eh/finallyexec/catchrettoinnertry_ro.csproj | 53 ---------------------- .../flowgraph/bug619534/twoEndFinallys.ilproj | 43 ------------------ .../flowgraph/bug619534/twoEndFinallys_il.ilproj | 43 ++++++++++++++++++ .../CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj | 43 ------------------ .../CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj | 43 ++++++++++++++++++ tests/src/JIT/jit64/regress/vsw/373472/test.ilproj | 44 ------------------ .../JIT/jit64/regress/vsw/373472/test_il.ilproj | 44 ++++++++++++++++++ 16 files changed, 153 insertions(+), 362 deletions(-) delete mode 100644 tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.csproj delete mode 100644 tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_do.csproj delete mode 100644 tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.csproj delete mode 100644 tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_ro.csproj delete mode 100644 tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj create mode 100644 tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj delete mode 100644 tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj create mode 100644 tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj delete mode 100644 tests/src/JIT/jit64/regress/vsw/373472/test.ilproj create mode 100644 tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj index 9fe68f741d..372da439ca 100644 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj +++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj @@ -26,15 +26,11 @@ - Full - - True - $(DefineConstants);DESKTOP + False - @@ -47,6 +43,9 @@ $(JitPackagesConfigFileDirectory)minimal\project.json $(JitPackagesConfigFileDirectory)minimal\project.lock.json + + + diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj index d7f9249646..154d225374 100644 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj +++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj @@ -26,15 +26,11 @@ - Full True - True - $(DefineConstants);DESKTOP - @@ -47,6 +43,9 @@ $(JitPackagesConfigFileDirectory)minimal\project.json $(JitPackagesConfigFileDirectory)minimal\project.lock.json + + + diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj index da1227b461..d6860e7588 100644 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj +++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj @@ -26,15 +26,11 @@ - - None - - True - $(DefineConstants);DESKTOP + PdbOnly + False - @@ -47,6 +43,9 @@ $(JitPackagesConfigFileDirectory)minimal\project.json $(JitPackagesConfigFileDirectory)minimal\project.lock.json + + + diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj index 1bbcf191ab..89718e95b9 100644 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj +++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj @@ -26,15 +26,11 @@ - - None + PdbOnly True - True - $(DefineConstants);DESKTOP - @@ -47,6 +43,9 @@ $(JitPackagesConfigFileDirectory)minimal\project.json $(JitPackagesConfigFileDirectory)minimal\project.lock.json + + + diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.csproj deleted file mode 100644 index 0401a464e0..0000000000 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - true - - - - - - - - - False - - - - Full - False - - - - - - - - - - - - - $(JitPackagesConfigFileDirectory)minimal\project.json - $(JitPackagesConfigFileDirectory)minimal\project.lock.json - - - - - - - - diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj index 9e240c6cbd..dd4ebd582e 100644 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj +++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj @@ -37,6 +37,9 @@ + + + diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_do.csproj deleted file mode 100644 index 1310e0fa98..0000000000 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_do.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - true - - - - - - - - - False - - - - Full - True - - - - - - - - - - - - - $(JitPackagesConfigFileDirectory)minimal\project.json - $(JitPackagesConfigFileDirectory)minimal\project.lock.json - - - - - - - - diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.csproj deleted file mode 100644 index 3464f6c8ed..0000000000 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - true - - - - - - - - - False - - - - - False - - - - - - - - - - - - - $(JitPackagesConfigFileDirectory)minimal\project.json - $(JitPackagesConfigFileDirectory)minimal\project.lock.json - - - - - - - - diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj index 0e25816b53..efa78c355c 100644 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj +++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj @@ -26,6 +26,7 @@ + PdbOnly @@ -36,6 +37,9 @@ + + + diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_ro.csproj deleted file mode 100644 index 6d5beaaf0f..0000000000 --- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_ro.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - true - - - - - - - - - False - - - - - True - - - - - - - - - - - - - $(JitPackagesConfigFileDirectory)minimal\project.json - $(JitPackagesConfigFileDirectory)minimal\project.lock.json - - - - - - - - diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj deleted file mode 100644 index a99e251e96..0000000000 --- a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.ilproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - - - - - - - - - False - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj new file mode 100644 index 0000000000..a99e251e96 --- /dev/null +++ b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj @@ -0,0 +1,43 @@ + + + + + Debug + AnyCPU + $(MSBuildProjectName) + 2.0 + {95DFC527-4DC1-495E-97D7-E94EE1F7140D} + Exe + Properties + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages + ..\..\ + 7a9bfb7d + + + + + + + + + False + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj deleted file mode 100644 index 5bd730e9df..0000000000 --- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.ilproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - - - - - - - - - False - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj new file mode 100644 index 0000000000..5bd730e9df --- /dev/null +++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj @@ -0,0 +1,43 @@ + + + + + Debug + AnyCPU + $(MSBuildProjectName) + 2.0 + {95DFC527-4DC1-495E-97D7-E94EE1F7140D} + Exe + Properties + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages + ..\..\ + 7a9bfb7d + + + + + + + + + False + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj b/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj deleted file mode 100644 index e1f57ec14d..0000000000 --- a/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - Debug - AnyCPU - $(MSBuildProjectName) - 2.0 - {95DFC527-4DC1-495E-97D7-E94EE1F7140D} - Exe - Properties - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages - ..\..\ - 7a9bfb7d - - - - - - - - - False - - - - Full - False - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj b/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj new file mode 100644 index 0000000000..e1f57ec14d --- /dev/null +++ b/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj @@ -0,0 +1,44 @@ + + + + + Debug + AnyCPU + $(MSBuildProjectName) + 2.0 + {95DFC527-4DC1-495E-97D7-E94EE1F7140D} + Exe + Properties + 512 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + $(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages + ..\..\ + 7a9bfb7d + + + + + + + + + False + + + + Full + False + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3