From b1ec90bcf4efda53e6a12eccdea6ac106a2e0d45 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Sun, 15 Aug 2010 07:07:24 +0000 Subject: [PATCH] Update tests. llvm-svn: 111096 --- llvm/test/LLVMC/ExternOptions.td | 26 --------------------- llvm/test/LLVMC/ForwardAs.td | 2 +- llvm/test/LLVMC/ForwardTransformedValue.td | 4 ++-- llvm/test/LLVMC/ForwardValue.td | 4 ++-- llvm/test/LLVMC/MultiValuedOption.td | 2 +- llvm/test/LLVMC/MultiplePluginPriorities.td | 18 -------------- llvm/test/LLVMC/TestWarnings.td | 2 +- llvm/tools/llvmc/src/Makefile | 2 +- 8 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 llvm/test/LLVMC/ExternOptions.td delete mode 100644 llvm/test/LLVMC/MultiplePluginPriorities.td diff --git a/llvm/test/LLVMC/ExternOptions.td b/llvm/test/LLVMC/ExternOptions.td deleted file mode 100644 index c033db06b80a..000000000000 --- a/llvm/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 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/llvm/test/LLVMC/ForwardAs.td b/llvm/test/LLVMC/ForwardAs.td index 547836b5e894..521f3c291e27 100644 --- a/llvm/test/LLVMC/ForwardAs.td +++ b/llvm/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/llvm/test/LLVMC/ForwardTransformedValue.td b/llvm/test/LLVMC/ForwardTransformedValue.td index ba75e26a2e60..5112bccbf89b 100644 --- a/llvm/test/LLVMC/ForwardTransformedValue.td +++ b/llvm/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/llvm/test/LLVMC/ForwardValue.td b/llvm/test/LLVMC/ForwardValue.td index f2539f81f58d..a6651b5dd044 100644 --- a/llvm/test/LLVMC/ForwardValue.td +++ b/llvm/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/llvm/test/LLVMC/MultiValuedOption.td b/llvm/test/LLVMC/MultiValuedOption.td index bd61d76dff7b..50c1f3d22a19 100644 --- a/llvm/test/LLVMC/MultiValuedOption.td +++ b/llvm/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/llvm/test/LLVMC/MultiplePluginPriorities.td b/llvm/test/LLVMC/MultiplePluginPriorities.td deleted file mode 100644 index 579224a02f3d..000000000000 --- a/llvm/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: -// 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/llvm/test/LLVMC/TestWarnings.td b/llvm/test/LLVMC/TestWarnings.td index 0388cb0b0f1e..b0f57e97e0d8 100644 --- a/llvm/test/LLVMC/TestWarnings.td +++ b/llvm/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/llvm/tools/llvmc/src/Makefile b/llvm/tools/llvmc/src/Makefile index 9cfb27f809b5..f3f30911a400 100644 --- a/llvm/tools/llvmc/src/Makefile +++ b/llvm/tools/llvmc/src/Makefile @@ -1,4 +1,4 @@ -##===- tools/llvmc/driver/Makefile -------------------------*- Makefile -*-===## +##===- tools/llvmc/src/Makefile ----------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure #