Update tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111096 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/LLVMC/ExternOptions.td b/test/LLVMC/ExternOptions.td
deleted file mode 100644 (file)
index c033db0..0000000
--- a/test/LLVMC/ExternOptions.td
+++ /dev/null
@@ -1,26 +0,0 @@
-// Check that extern options work.
-// The dummy tool and graph are required to silence warnings.
-// RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: FileCheck -input-file %t %s
-// RUN: %compile_cxx -x c++ %t
-// XFAIL: vg_leak
-
-include "llvm/CompilerDriver/Common.td"
-
-// CHECK: extern cl::opt<bool> AutoGeneratedSwitch_Wall
-
-def OptList : OptionList<[(switch_option "Wall", (extern)),
-                          (parameter_option "std", (extern)),
-                          (prefix_list_option "L", (extern))]>;
-
-def dummy_tool : Tool<[
-(command "dummy_cmd"),
-(in_language "dummy"),
-(out_language "dummy"),
-(actions (case
-         (switch_on "Wall"), (stop_compilation),
-         (not_empty "std"), (stop_compilation),
-         (not_empty "L"), (stop_compilation)))
-]>;
-
-def DummyGraph : CompilationGraph<[SimpleEdge<"root", "dummy_tool">]>;

diff --git a/test/LLVMC/ForwardAs.td b/test/LLVMC/ForwardAs.td
index 547836b5e894caf304f4babb41f60c5f07702e32..521f3c291e27c5d473722978bb094e3eeaf3fb11 100644 (file)
--- a/test/LLVMC/ForwardAs.td
+++ b/test/LLVMC/ForwardAs.td
@@ -7,7 +7,7 @@
 
 include "llvm/CompilerDriver/Common.td"
 
-def OptList : OptionList<[(parameter_option "dummy", (extern))]>;
+def OptList : OptionList<[(parameter_option "dummy", (help "dummmy"))]>;
 
 def dummy_tool : Tool<[
 (command "dummy_cmd"),

diff --git a/test/LLVMC/ForwardTransformedValue.td b/test/LLVMC/ForwardTransformedValue.td
index ba75e26a2e6047c989197453ade4b02cf5be3607..5112bccbf89b933acce493f6ad05203689a8774c 100644 (file)
--- a/test/LLVMC/ForwardTransformedValue.td
+++ b/test/LLVMC/ForwardTransformedValue.td
@@ -7,8 +7,8 @@
 
 include "llvm/CompilerDriver/Common.td"
 
-def OptList : OptionList<[(parameter_option "a", (extern)),
-                          (prefix_list_option "b", (extern))]>;
+def OptList : OptionList<[(parameter_option "a", (help "dummy")),
+                          (prefix_list_option "b", (help "dummy"))]>;
 
 // CHECK: std::string HookA
 // CHECK: std::string HookB

diff --git a/test/LLVMC/ForwardValue.td b/test/LLVMC/ForwardValue.td
index f2539f81f58d9f7b60085caf206d80c0d40e8ebf..a6651b5dd0445a43d12146011195ff41d43275af 100644 (file)
--- a/test/LLVMC/ForwardValue.td
+++ b/test/LLVMC/ForwardValue.td
@@ -7,8 +7,8 @@
 
 include "llvm/CompilerDriver/Common.td"
 
-def OptList : OptionList<[(parameter_option "a", (extern)),
-                          (prefix_list_option "b", (extern))]>;
+def OptList : OptionList<[(parameter_option "a", (help "dummy")),
+                          (prefix_list_option "b", (help "dummy"))]>;
 
 def dummy_tool : Tool<[
 (command "dummy_cmd"),

diff --git a/test/LLVMC/MultiValuedOption.td b/test/LLVMC/MultiValuedOption.td
index bd61d76dff7b58d1e98da08383fa413c144f7fd3..50c1f3d22a19e142349bf2db3ea7a99bc5626e37 100644 (file)
--- a/test/LLVMC/MultiValuedOption.td
+++ b/test/LLVMC/MultiValuedOption.td
@@ -10,7 +10,7 @@ include "llvm/CompilerDriver/Common.td"
 def OptList : OptionList<[
     // CHECK: cl::multi_val(2)
     (prefix_list_option "foo", (multi_val 2)),
-    (parameter_list_option "baz", (multi_val 2), (extern))]>;
+    (parameter_list_option "baz", (multi_val 2))]>;
 
 def dummy_tool : Tool<[
 (command "dummy_cmd"),

diff --git a/test/LLVMC/MultiplePluginPriorities.td b/test/LLVMC/MultiplePluginPriorities.td
deleted file mode 100644 (file)
index 579224a..0000000
--- a/test/LLVMC/MultiplePluginPriorities.td
+++ /dev/null
@@ -1,18 +0,0 @@
-// Check that multiple plugin priorities are not allowed.
-// RUN: ignore tblgen -I %p/../../include --gen-llvmc %s |& grep "More than one 'PluginPriority' instance found"
-// XFAIL: vg_leak
-
-// Disable for Darwin PPC: <rdar://problem/7598390>
-// XFAIL: powerpc-apple-darwin
-// XFAIL: powerpc-darwin9
-
-// This also fails on i386-darwin9 for some reason
-// XFAIL: i386-darwin9
-
-include "llvm/CompilerDriver/Common.td"
-
-def Graph : CompilationGraph<[]>;
-
-def Priority1 : PluginPriority<1>;
-
-def Priority2 : PluginPriority<2>;

diff --git a/test/LLVMC/TestWarnings.td b/test/LLVMC/TestWarnings.td
index 0388cb0b0f1e80fe13a4355169b1591cf3c13367..b0f57e97e0d8cadefebf6b2875dc6b6c40f5ab0c 100644 (file)
--- a/test/LLVMC/TestWarnings.td
+++ b/test/LLVMC/TestWarnings.td
@@ -5,4 +5,4 @@
 
 include "llvm/CompilerDriver/Common.td"
 
-def OptList : OptionList<[(switch_option "Wall", (extern))]>;
+def OptList : OptionList<[(switch_option "Wall", (help "dummy"))]>;

diff --git a/tools/llvmc/src/Makefile b/tools/llvmc/src/Makefile
index 9cfb27f809b5447fd3a43a66ac4c308a8dbfdd28..f3f30911a40018b958cfc4637cc9fba49ba1fbec 100644 (file)
--- a/tools/llvmc/src/Makefile
+++ b/tools/llvmc/src/Makefile
@@ -1,4 +1,4 @@
-##===- tools/llvmc/driver/Makefile -------------------------*- Makefile -*-===##
+##===- tools/llvmc/src/Makefile ----------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #