undo validation test changes

Author: bob80905

tools/clang/unittests/HLSL/CompilerTest.cpp

@@ -3712,7 +3712,7 @@ TEST_F(CompilerTest, CompileWhenODumpThenOptimizerMatch) {
     LPCWSTR Target = L"ps_6_0";
     CreateBlobFromText("float4 main() : SV_Target { return 0; }", &pSource);
 
-    LPCWSTR Args[3] = {OptLevel, L"-select-validator external", L"/Odump"};
+    LPCWSTR Args[2] = {OptLevel, L"/Odump"};
 
     // Get the passes for this optimization level.
     VERIFY_SUCCEEDED(pCompiler->Compile(pSource, L"source.hlsl", L"main",

tools/clang/unittests/HLSL/DxilModuleTest.cpp

@@ -514,67 +514,51 @@ TEST_F(DxilModuleTest, SetValidatorVersion) {
     return;
 
   // Current version
-  VerifyValidatorVersionMatches(L"ps_6_2", {L"-select-validator external"});
-  VerifyValidatorVersionMatches(L"lib_6_3", {L"-select-validator external"});
+  VerifyValidatorVersionMatches(L"ps_6_2", {});
+  VerifyValidatorVersionMatches(L"lib_6_3", {});
 
   // Current version, with validation disabled
-  VerifyValidatorVersionMatches(L"ps_6_2",
-                                {L"-Vd", L"-select-validator external"});
-  VerifyValidatorVersionMatches(L"lib_6_3",
-                                {L"-Vd", L"-select-validator external"});
+  VerifyValidatorVersionMatches(L"ps_6_2", {L"-Vd"});
+  VerifyValidatorVersionMatches(L"lib_6_3", {L"-Vd"});
 
   // Override validator version
-  VerifyValidatorVersionMatches(
-      L"ps_6_2", {L"-validator-version", L"1.2", L"-select-validator external"},
-      1, 2);
-  VerifyValidatorVersionMatches(
-      L"lib_6_3",
-      {L"-validator-version", L"1.3", L"-select-validator external"}, 1, 3);
+  VerifyValidatorVersionMatches(L"ps_6_2", {L"-validator-version", L"1.2"}, 1,
+                                2);
+  VerifyValidatorVersionMatches(L"lib_6_3", {L"-validator-version", L"1.3"}, 1,
+                                3);
 
   // Override validator version, with validation disabled
-  VerifyValidatorVersionMatches(
-      L"ps_6_2",
-      {L"-Vd", L"-validator-version", L"1.2", L"-select-validator external"}, 1,
-      2);
-  VerifyValidatorVersionMatches(
-      L"lib_6_3",
-      {L"-Vd", L"-validator-version", L"1.3", L"-select-validator external"}, 1,
-      3);
+  VerifyValidatorVersionMatches(L"ps_6_2",
+                                {L"-Vd", L"-validator-version", L"1.2"}, 1, 2);
+  VerifyValidatorVersionMatches(L"lib_6_3",
+                                {L"-Vd", L"-validator-version", L"1.3"}, 1, 3);
 
   // Never can validate (version 0,0):
-  VerifyValidatorVersionMatches(L"lib_6_1",
-                                {L"-Vd", L"-select-validator external"}, 0, 0);
+  VerifyValidatorVersionMatches(L"lib_6_1", {L"-Vd"}, 0, 0);
+  VerifyValidatorVersionMatches(L"lib_6_2", {L"-Vd"}, 0, 0);
   VerifyValidatorVersionMatches(L"lib_6_2",
-                                {L"-Vd", L"-select-validator external"}, 0, 0);
-  VerifyValidatorVersionMatches(
-      L"lib_6_2",
-      {L"-Vd", L"-validator-version", L"0.0", L"-select-validator external"}, 0,
-      0);
+                                {L"-Vd", L"-validator-version", L"0.0"}, 0, 0);
   VerifyValidatorVersionMatches(L"lib_6_x", {}, 0, 0);
-  VerifyValidatorVersionMatches(
-      L"lib_6_x",
-      {L"-validator-version", L"0.0", L"-select-validator external"}, 0, 0);
+  VerifyValidatorVersionMatches(L"lib_6_x", {L"-validator-version", L"0.0"}, 0,
+                                0);
 
   // Failure cases:
   VerifyValidatorVersionFails(
-      L"ps_6_2", {L"-validator-version", L"1.1", L"-select-validator external"},
+      L"ps_6_2", {L"-validator-version", L"1.1"},
       {"validator version 1,1 does not support target profile."});
 
   VerifyValidatorVersionFails(
-      L"lib_6_2", {L"-Tlib_6_2", L"-select-validator external"},
+      L"lib_6_2", {L"-Tlib_6_2"},
       {"Must disable validation for unsupported lib_6_1 or lib_6_2 targets"});
 
-  VerifyValidatorVersionFails(
-      L"lib_6_2",
-      {L"-Vd", L"-validator-version", L"1.2", L"-select-validator external"},
-      {"-validator-version cannot be used with library "
-       "profiles lib_6_1 or lib_6_2."});
+  VerifyValidatorVersionFails(L"lib_6_2",
+                              {L"-Vd", L"-validator-version", L"1.2"},
+                              {"-validator-version cannot be used with library "
+                               "profiles lib_6_1 or lib_6_2."});
 
-  VerifyValidatorVersionFails(
-      L"lib_6_x",
-      {L"-validator-version", L"1.3", L"-select-validator external"},
-      {"Offline library profile cannot be used with "
-       "non-zero -validator-version."});
+  VerifyValidatorVersionFails(L"lib_6_x", {L"-validator-version", L"1.3"},
+                              {"Offline library profile cannot be used with "
+                               "non-zero -validator-version."});
 }
 
 TEST_F(DxilModuleTest, PayloadQualifier) {