summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Glushenkov <foldr@codedgers.com>2010-08-15 07:07:24 +0000
committerMikhail Glushenkov <foldr@codedgers.com>2010-08-15 07:07:24 +0000
commit0b63f378650f53b26f57a39b63b4cbceaefc7bef (patch)
tree247892954be7786741cd87d749f25b619289b7e2
parent4b643c0dfd78e873d5ae7f18b2ed25039f339a39 (diff)
downloadllvm-0b63f378650f53b26f57a39b63b4cbceaefc7bef.tar.gz
llvm-0b63f378650f53b26f57a39b63b4cbceaefc7bef.tar.bz2
llvm-0b63f378650f53b26f57a39b63b4cbceaefc7bef.tar.xz
Update tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111096 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/LLVMC/ExternOptions.td26
-rw-r--r--test/LLVMC/ForwardAs.td2
-rw-r--r--test/LLVMC/ForwardTransformedValue.td4
-rw-r--r--test/LLVMC/ForwardValue.td4
-rw-r--r--test/LLVMC/MultiValuedOption.td2
-rw-r--r--test/LLVMC/MultiplePluginPriorities.td18
-rw-r--r--test/LLVMC/TestWarnings.td2
-rw-r--r--tools/llvmc/src/Makefile2
8 files changed, 8 insertions, 52 deletions
diff --git a/test/LLVMC/ExternOptions.td b/test/LLVMC/ExternOptions.td
deleted file mode 100644
index c033db06b8..0000000000
--- 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 547836b5e8..521f3c291e 100644
--- 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 ba75e26a2e..5112bccbf8 100644
--- 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 f2539f81f5..a6651b5dd0 100644
--- 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 bd61d76dff..50c1f3d22a 100644
--- 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
index 579224a02f..0000000000
--- 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 0388cb0b0f..b0f57e97e0 100644
--- 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 9cfb27f809..f3f30911a4 100644
--- 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
#