[llvm-commits] [llvm] r81661 - in /llvm/trunk/test/LLVMC: C++/ C++/dash-x.cpp C++/dg.exp C++/hello.cpp C++/together.cpp C/ C/dg.exp C/emit-llvm.c C/hello.c C/include.c C/opt-test.c C/sink.c C/wall.c ObjC++/ ObjC++/dg.exp ObjC++/hello.mm ObjC/ ObjC/dg.exp ObjC/hello.m dash-x.cpp dg.exp emit-llvm.c hello.c hello.cpp hello.m hello.mm include.c llvmc.exp opt-test.c sink.c together.cpp wall.c

Daniel Dunbar daniel at zuster.org
Sat Sep 12 18:39:09 PDT 2009 

Author: ddunbar
Date: Sat Sep 12 20:39:08 2009
New Revision: 81661

URL: http://llvm.org/viewvc/llvm-project?rev=81661&view=rev
Log:
Sink llvm-gcc dependent tests into distinct subdirs.

Added:
    llvm/trunk/test/LLVMC/C/
    llvm/trunk/test/LLVMC/C++/
    llvm/trunk/test/LLVMC/C++/dash-x.cpp
      - copied, changed from r81660, llvm/trunk/test/LLVMC/dash-x.cpp
    llvm/trunk/test/LLVMC/C++/dg.exp
    llvm/trunk/test/LLVMC/C++/hello.cpp
      - copied, changed from r81660, llvm/trunk/test/LLVMC/hello.cpp
    llvm/trunk/test/LLVMC/C++/together.cpp
      - copied, changed from r81660, llvm/trunk/test/LLVMC/together.cpp
    llvm/trunk/test/LLVMC/C/dg.exp
    llvm/trunk/test/LLVMC/C/emit-llvm.c
      - copied, changed from r81660, llvm/trunk/test/LLVMC/emit-llvm.c
    llvm/trunk/test/LLVMC/C/hello.c
      - copied, changed from r81660, llvm/trunk/test/LLVMC/hello.c
    llvm/trunk/test/LLVMC/C/include.c
      - copied, changed from r81660, llvm/trunk/test/LLVMC/include.c
    llvm/trunk/test/LLVMC/C/opt-test.c
      - copied, changed from r81660, llvm/trunk/test/LLVMC/opt-test.c
    llvm/trunk/test/LLVMC/C/sink.c
      - copied, changed from r81660, llvm/trunk/test/LLVMC/sink.c
    llvm/trunk/test/LLVMC/C/wall.c
      - copied, changed from r81660, llvm/trunk/test/LLVMC/wall.c
    llvm/trunk/test/LLVMC/ObjC/
    llvm/trunk/test/LLVMC/ObjC++/
    llvm/trunk/test/LLVMC/ObjC++/dg.exp
    llvm/trunk/test/LLVMC/ObjC++/hello.mm
      - copied, changed from r81660, llvm/trunk/test/LLVMC/hello.mm
    llvm/trunk/test/LLVMC/ObjC/dg.exp
    llvm/trunk/test/LLVMC/ObjC/hello.m
      - copied, changed from r81660, llvm/trunk/test/LLVMC/hello.m
    llvm/trunk/test/LLVMC/dg.exp
Removed:
    llvm/trunk/test/LLVMC/dash-x.cpp
    llvm/trunk/test/LLVMC/emit-llvm.c
    llvm/trunk/test/LLVMC/hello.c
    llvm/trunk/test/LLVMC/hello.cpp
    llvm/trunk/test/LLVMC/hello.m
    llvm/trunk/test/LLVMC/hello.mm
    llvm/trunk/test/LLVMC/include.c
    llvm/trunk/test/LLVMC/llvmc.exp
    llvm/trunk/test/LLVMC/opt-test.c
    llvm/trunk/test/LLVMC/sink.c
    llvm/trunk/test/LLVMC/together.cpp
    llvm/trunk/test/LLVMC/wall.c

Copied: llvm/trunk/test/LLVMC/C++/dash-x.cpp (from r81660, llvm/trunk/test/LLVMC/dash-x.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C%2B%2B/dash-x.cpp?p2=llvm/trunk/test/LLVMC/C%2B%2B/dash-x.cpp&p1=llvm/trunk/test/LLVMC/dash-x.cpp&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
--- llvm/trunk/test/LLVMC/dash-x.cpp (original)
+++ llvm/trunk/test/LLVMC/C++/dash-x.cpp Sat Sep 12 20:39:08 2009
@@ -1,5 +1,5 @@
 // Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
+// RUN: llvmc -x c++ %s -x c %p/../test_data/false.cpp -x lisp -x whatnot -x none %p/../test_data/false2.cpp -o %t
 // RUN: ./%t | grep hello
 
 #include <iostream>

Added: llvm/trunk/test/LLVMC/C++/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C%2B%2B/dg.exp?rev=81661&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/C++/dg.exp (added)
+++ llvm/trunk/test/LLVMC/C++/dg.exp Sat Sep 12 20:39:08 2009
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports c++ ] then {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}

Copied: llvm/trunk/test/LLVMC/C++/hello.cpp (from r81660, llvm/trunk/test/LLVMC/hello.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C%2B%2B/hello.cpp?p2=llvm/trunk/test/LLVMC/C%2B%2B/hello.cpp&p1=llvm/trunk/test/LLVMC/hello.cpp&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/test/LLVMC/C++/together.cpp (from r81660, llvm/trunk/test/LLVMC/together.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C%2B%2B/together.cpp?p2=llvm/trunk/test/LLVMC/C%2B%2B/together.cpp&p1=llvm/trunk/test/LLVMC/together.cpp&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
--- llvm/trunk/test/LLVMC/together.cpp (original)
+++ llvm/trunk/test/LLVMC/C++/together.cpp Sat Sep 12 20:39:08 2009
@@ -1,5 +1,5 @@
 // Check that we can compile files of different types together.
-// RUN: llvmc %s %p/test_data/together.c -o %t
+// RUN: llvmc %s %p/../test_data/together.c -o %t
 // RUN: ./%t | grep hello
 
 extern "C" void test();

Added: llvm/trunk/test/LLVMC/C/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/dg.exp?rev=81661&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/C/dg.exp (added)
+++ llvm/trunk/test/LLVMC/C/dg.exp Sat Sep 12 20:39:08 2009
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports c ] then {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}

Copied: llvm/trunk/test/LLVMC/C/emit-llvm.c (from r81660, llvm/trunk/test/LLVMC/emit-llvm.c)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/emit-llvm.c?p2=llvm/trunk/test/LLVMC/C/emit-llvm.c&p1=llvm/trunk/test/LLVMC/emit-llvm.c&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/test/LLVMC/C/hello.c (from r81660, llvm/trunk/test/LLVMC/hello.c)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/hello.c?p2=llvm/trunk/test/LLVMC/C/hello.c&p1=llvm/trunk/test/LLVMC/hello.c&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/test/LLVMC/C/include.c (from r81660, llvm/trunk/test/LLVMC/include.c)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/include.c?p2=llvm/trunk/test/LLVMC/C/include.c&p1=llvm/trunk/test/LLVMC/include.c&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/test/LLVMC/C/opt-test.c (from r81660, llvm/trunk/test/LLVMC/opt-test.c)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/opt-test.c?p2=llvm/trunk/test/LLVMC/C/opt-test.c&p1=llvm/trunk/test/LLVMC/opt-test.c&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/test/LLVMC/C/sink.c (from r81660, llvm/trunk/test/LLVMC/sink.c)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/sink.c?p2=llvm/trunk/test/LLVMC/C/sink.c&p1=llvm/trunk/test/LLVMC/sink.c&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Copied: llvm/trunk/test/LLVMC/C/wall.c (from r81660, llvm/trunk/test/LLVMC/wall.c)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C/wall.c?p2=llvm/trunk/test/LLVMC/C/wall.c&p1=llvm/trunk/test/LLVMC/wall.c&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Added: llvm/trunk/test/LLVMC/ObjC++/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/ObjC%2B%2B/dg.exp?rev=81661&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/ObjC++/dg.exp (added)
+++ llvm/trunk/test/LLVMC/ObjC++/dg.exp Sat Sep 12 20:39:08 2009
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports obj-c++ ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
+}

Copied: llvm/trunk/test/LLVMC/ObjC++/hello.mm (from r81660, llvm/trunk/test/LLVMC/hello.mm)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/ObjC%2B%2B/hello.mm?p2=llvm/trunk/test/LLVMC/ObjC%2B%2B/hello.mm&p1=llvm/trunk/test/LLVMC/hello.mm&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Added: llvm/trunk/test/LLVMC/ObjC/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/ObjC/dg.exp?rev=81661&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/ObjC/dg.exp (added)
+++ llvm/trunk/test/LLVMC/ObjC/dg.exp Sat Sep 12 20:39:08 2009
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports objc ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
+}

Copied: llvm/trunk/test/LLVMC/ObjC/hello.m (from r81660, llvm/trunk/test/LLVMC/hello.m)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/ObjC/hello.m?p2=llvm/trunk/test/LLVMC/ObjC/hello.m&p1=llvm/trunk/test/LLVMC/hello.m&r1=81660&r2=81661&rev=81661&view=diff

==============================================================================
    (empty)

Removed: llvm/trunk/test/LLVMC/dash-x.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/dash-x.cpp?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/dash-x.cpp (original)
+++ llvm/trunk/test/LLVMC/dash-x.cpp (removed)
@@ -1,14 +0,0 @@
-// Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
-// RUN: ./%t | grep hello
-
-#include <iostream>
-
-extern "C" void test();
-extern std::string test2();
-
-int main() {
-    std::cout << "h";
-    test();
-    std::cout << test2() << '\n';
-}

Added: llvm/trunk/test/LLVMC/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/dg.exp?rev=81661&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/dg.exp (added)
+++ llvm/trunk/test/LLVMC/dg.exp Sat Sep 12 20:39:08 2009
@@ -0,0 +1,3 @@
+load_lib llvm.exp
+
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]

Removed: llvm/trunk/test/LLVMC/emit-llvm.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/emit-llvm.c?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/emit-llvm.c (original)
+++ llvm/trunk/test/LLVMC/emit-llvm.c (removed)
@@ -1,4 +0,0 @@
-// RUN: llvmc -c -emit-llvm -o - %s | llvm-dis | grep "@f0()" | count 1
-
-int f0(void) {
-}

Removed: llvm/trunk/test/LLVMC/hello.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/hello.c?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/hello.c (original)
+++ llvm/trunk/test/LLVMC/hello.c (removed)
@@ -1,12 +0,0 @@
-/*
- * Check that we can compile helloworld
- * RUN: llvmc %s -o %t
- * RUN: ./%t | grep hello
- */
-
-#include <stdio.h>
-
-int main() {
-    printf("hello\n");
-    return 0;
-}

Removed: llvm/trunk/test/LLVMC/hello.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/hello.cpp?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/hello.cpp (original)
+++ llvm/trunk/test/LLVMC/hello.cpp (removed)
@@ -1,8 +0,0 @@
-// Test that we can compile C++ code.
-// RUN: llvmc %s -o %t
-// RUN: ./%t | grep hello
-#include <iostream>
-
-int main() {
-    std::cout << "hello" << '\n';
-}

Removed: llvm/trunk/test/LLVMC/hello.m
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/hello.m?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/hello.m (original)
+++ llvm/trunk/test/LLVMC/hello.m (removed)
@@ -1,12 +0,0 @@
-/*
- * Check that we can compile helloworld
- * RUN: llvmc %s -o %t
- * RUN: ./%t | grep hello
- */
-
-#include <stdio.h>
-
-int main() {
-    printf("hello\n");
-    return 0;
-}

Removed: llvm/trunk/test/LLVMC/hello.mm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/hello.mm?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/hello.mm (original)
+++ llvm/trunk/test/LLVMC/hello.mm (removed)
@@ -1,8 +0,0 @@
-// Test that we can compile Objective-C++ code.
-// RUN: llvmc %s -o %t
-// RUN: ./%t | grep hello
-#include <iostream>
-
-int main() {
-    std::cout << "hello" << '\n';
-}

Removed: llvm/trunk/test/LLVMC/include.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/include.c?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/include.c (original)
+++ llvm/trunk/test/LLVMC/include.c (removed)
@@ -1,9 +0,0 @@
-/*
- * Check that the 'include' options work.
- * RUN: echo "int x;\n" > %t1.inc
- * RUN: llvmc -include %t1.inc -fsyntax-only %s
- */
-
-int f0(void) {
-  return x;
-}

Removed: llvm/trunk/test/LLVMC/llvmc.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/llvmc.exp?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/llvmc.exp (original)
+++ llvm/trunk/test/LLVMC/llvmc.exp (removed)
@@ -1,19 +0,0 @@
-load_lib llvm.exp
-
-if [ llvm_gcc_supports c ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{c}]]
-}
-
-if [ llvm_gcc_supports c++ ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{cpp}]]
-}
-
-if [ llvm_gcc_supports objc ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
-}
-
-if [ llvm_gcc_supports obj-c++ ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
-}
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]

Removed: llvm/trunk/test/LLVMC/opt-test.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/opt-test.c?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/opt-test.c (original)
+++ llvm/trunk/test/LLVMC/opt-test.c (removed)
@@ -1,12 +0,0 @@
-/*
- * Check that the -opt switch works.
- * RUN: llvmc %s -opt -o %t
- * RUN: ./%t | grep hello
- */
-
-#include <stdio.h>
-
-int main() {
-    printf("hello\n");
-    return 0;
-}

Removed: llvm/trunk/test/LLVMC/sink.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/sink.c?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/sink.c (original)
+++ llvm/trunk/test/LLVMC/sink.c (removed)
@@ -1,12 +0,0 @@
-/*
- * Check that the 'sink' options work.
- * RUN: llvmc -v -Wall %s -o %t |& grep "Wall"
- * RUN: ./%t | grep hello
- */
-
-#include <stdio.h>
-
-int main() {
-    printf("hello\n");
-    return 0;
-}

Removed: llvm/trunk/test/LLVMC/together.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/together.cpp?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/together.cpp (original)
+++ llvm/trunk/test/LLVMC/together.cpp (removed)
@@ -1,9 +0,0 @@
-// Check that we can compile files of different types together.
-// RUN: llvmc %s %p/test_data/together.c -o %t
-// RUN: ./%t | grep hello
-
-extern "C" void test();
-
-int main() {
-  test();
-}

Removed: llvm/trunk/test/LLVMC/wall.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/wall.c?rev=81660&view=auto

==============================================================================
--- llvm/trunk/test/LLVMC/wall.c (original)
+++ llvm/trunk/test/LLVMC/wall.c (removed)
@@ -1,12 +0,0 @@
-/*
- * Check that -Wall works as intended
- * RUN: llvmc -Wall %s -o %t
- * RUN: ./%t | grep hello
- */
-
-#include <stdio.h>
-
-int main() {
-    printf("hello\n");
-    return 0;
-}

More information about the llvm-commits mailing list