[llvm-commits] [llvm] r81709 - in /llvm/trunk/test/LLVMC: C++/dash-x.cpp test_data/false.c

[Mikhail Glushenkov]

Author: foldr
Date: Sun Sep 13 15:14:57 2009
New Revision: 81709

URL: http://llvm.org/viewvc/llvm-project?rev=81709&view=rev
Log:
Fix a small issue with recent changes to this code.

The 'false.c' file wasn't being used.

Modified:
    llvm/trunk/test/LLVMC/C++/dash-x.cpp
    llvm/trunk/test/LLVMC/test_data/false.c

Modified: llvm/trunk/test/LLVMC/C++/dash-x.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/C%2B%2B/dash-x.cpp?rev=81709&r1=81708&r2=81709&view=diff

==============================================================================
--- llvm/trunk/test/LLVMC/C++/dash-x.cpp (original)
+++ llvm/trunk/test/LLVMC/C++/dash-x.cpp Sun Sep 13 15:14:57 2009
@@ -1,14 +1,9 @@
 // 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 %s -x c++ %p/../test_data/false.c -x c %p/../test_data/false.cpp -x lisp -x whatnot -x none %p/../test_data/false2.cpp -o %t
 // RUN: %abs_tmp | grep hello
 
-#include <iostream>
-
-extern "C" void test();
-extern std::string test2();
+extern int test_main();
 
 int main() {
-    std::cout << "h";
-    test();
-    std::cout << test2() << '\n';
+  test_main();
 }

Modified: llvm/trunk/test/LLVMC/test_data/false.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/test_data/false.c?rev=81709&r1=81708&r2=81709&view=diff

==============================================================================
--- llvm/trunk/test/LLVMC/test_data/false.c (original)
+++ llvm/trunk/test/LLVMC/test_data/false.c Sun Sep 13 15:14:57 2009
@@ -3,8 +3,8 @@
 extern "C" void test();
 extern std::string test2();
 
-int main() {
-    std::cout << "h";
-    test();
-    std::cout << test2() << '\n';
+int test_main() {
+  std::cout << "h";
+  test();
+  std::cout << test2() << '\n';
 }