r178825 - Add a module testcase with a using declaration.

[Rafael Espindola]

Author: rafael
Date: Thu Apr  4 19:52:14 2013
New Revision: 178825

URL: http://llvm.org/viewvc/llvm-project?rev=178825&view=rev
Log:
Add a module testcase with a using declaration.

Thanks a lot to Richard Smith for the suggestion.

Modified:
    cfe/trunk/test/Modules/Inputs/linkage-merge-bar.h
    cfe/trunk/test/Modules/Inputs/linkage-merge-foo.h
    cfe/trunk/test/Modules/linkage-merge.cpp

Modified: cfe/trunk/test/Modules/Inputs/linkage-merge-bar.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/linkage-merge-bar.h?rev=178825&r1=178824&r2=178825&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/linkage-merge-bar.h (original)
+++ cfe/trunk/test/Modules/Inputs/linkage-merge-bar.h Thu Apr  4 19:52:14 2013
@@ -0,0 +1,3 @@
+#include <linkage-merge-foo.h>
+
+using ::g;

Modified: cfe/trunk/test/Modules/Inputs/linkage-merge-foo.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/linkage-merge-foo.h?rev=178825&r1=178824&r2=178825&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/linkage-merge-foo.h (original)
+++ cfe/trunk/test/Modules/Inputs/linkage-merge-foo.h Thu Apr  4 19:52:14 2013
@@ -1 +1,2 @@
 int f();
+static int g(int);

Modified: cfe/trunk/test/Modules/linkage-merge.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/linkage-merge.cpp?rev=178825&r1=178824&r2=178825&view=diff
==============================================================================
--- cfe/trunk/test/Modules/linkage-merge.cpp (original)
+++ cfe/trunk/test/Modules/linkage-merge.cpp Thu Apr  4 19:52:14 2013
@@ -1,7 +1,13 @@
-// RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I %S/Inputs %s
+// FIXME: we should be able to put these in the .h file :-(
+// expected-note {{target of using declaration}}
+// expected-note {{using declaration}}
 
 #include "linkage-merge-bar.h"
 
 static int f(int);
 int f(int);
+
+static void g(int); // expected-error {{declaration conflicts with target of using declaration already in scope}}
+
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -verify -fmodules -fmodules-cache-path=%t -I %S/Inputs %s