Author: djasper Date: Wed Dec 11 03:11:12 2013 New Revision: 197021 URL: http://llvm.org/viewvc/llvm-project?rev=197021&view=rev Log: Change layering warning tests to not actually build modules.
Specifically, we want to warn only for direct layering violations for the modules we are calling clang on. This temporarily unblocks http://llvm-reviews.chandlerc.com/D2374 Once that is in, we'll also want to investigate whether to check the layering in the build step of modules that we build transitively. Modified: cfe/trunk/test/Modules/Inputs/declare-use/module.map cfe/trunk/test/Modules/declare-use1.cpp cfe/trunk/test/Modules/declare-use2.cpp Modified: cfe/trunk/test/Modules/Inputs/declare-use/module.map URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/declare-use/module.map?rev=197021&r1=197020&r2=197021&view=diff ============================================================================== --- cfe/trunk/test/Modules/Inputs/declare-use/module.map (original) +++ cfe/trunk/test/Modules/Inputs/declare-use/module.map Wed Dec 11 03:11:12 2013 @@ -9,11 +9,13 @@ module XB { module XC { header "c.h" use XA + // Intentionally doesn't use XB to show that -fdecl-use isn't transitive. } module XD { header "d.h" use XA + // Intentionally doesn't use XB to show that -fdecl-use isn't transitive. } module XE { Modified: cfe/trunk/test/Modules/declare-use1.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/declare-use1.cpp?rev=197021&r1=197020&r2=197021&view=diff ============================================================================== --- cfe/trunk/test/Modules/declare-use1.cpp (original) +++ cfe/trunk/test/Modules/declare-use1.cpp Wed Dec 11 03:11:12 2013 @@ -1,5 +1,5 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodules-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify +// RUN: %clang_cc1 -fmodule-maps -fmodules-cache-path=%t -fmodules-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify #include "g.h" #include "e.h" Modified: cfe/trunk/test/Modules/declare-use2.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/declare-use2.cpp?rev=197021&r1=197020&r2=197021&view=diff ============================================================================== --- cfe/trunk/test/Modules/declare-use2.cpp (original) +++ cfe/trunk/test/Modules/declare-use2.cpp Wed Dec 11 03:11:12 2013 @@ -1,7 +1,7 @@ // RUN: rm -rf %t -// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodules-decluse -fmodule-name=XH -I %S/Inputs/declare-use %s -verify +// RUN: %clang_cc1 -fmodule-maps -fmodules-cache-path=%t -fmodules-decluse -fmodule-name=XH -I %S/Inputs/declare-use %s -verify #include "h.h" #include "e.h" -#include "f.h" // expected-error {{does not depend on a module exporting}} +#include "f.h" // expected-error {{module XH does not depend on a module exporting 'f.h'}} const int h2 = h1+e+f; _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
