r243657 - Add fmodules-cache-path to 2 tests which were missing it.
Pete Cooper
peter_cooper at apple.com
Thu Jul 30 10:26:22 PDT 2015
> On Jul 30, 2015, at 10:23 AM, Richard Smith <metafoo at gmail.com> wrote:
>
> On Jul 30, 2015 10:01 AM, "Pete Cooper" <peter_cooper at apple.com <mailto:peter_cooper at apple.com>> wrote:
> >
> > Author: pete
> > Date: Thu Jul 30 11:44:07 2015
> > New Revision: 243657
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=243657&view=rev <http://llvm.org/viewvc/llvm-project?rev=243657&view=rev>
> > Log:
> > Add fmodules-cache-path to 2 tests which were missing it.
> >
> > These tests were creating a modules.idx file in my clang checkout, not
> > the build directory or temp.
> >
> > All the other tests in this directory use -fmodules-cache-path=%t so
> > updated these to match.
>
> I think this is a code bug, not a problem in the test. -emit-module should not create a modules.idx file when given -o, nor when no module cache path is specified.
>
Ah, didn’t realize that. Do you want me to revert this, or leave this in place until a real fix can be implemented? Personally i’d prefer to keep the clang checkout clean of the modules.idx file, but I won’t argue if you want a revert now.
Pete
> > Modified:
> > cfe/trunk/test/Modules/dependency-gen.modulemap
> > cfe/trunk/test/Modules/stress1.cpp
> >
> > Modified: cfe/trunk/test/Modules/dependency-gen.modulemap
> > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/dependency-gen.modulemap?rev=243657&r1=243656&r2=243657&view=diff <http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/dependency-gen.modulemap?rev=243657&r1=243656&r2=243657&view=diff>
> > ==============================================================================
> > --- cfe/trunk/test/Modules/dependency-gen.modulemap (original)
> > +++ cfe/trunk/test/Modules/dependency-gen.modulemap Thu Jul 30 11:44:07 2015
> > @@ -1,7 +1,7 @@
> > // RUN: cd %S
> > // RUN: rm -f %t.cpm %t-base.pcm %t-base.d %t.d
> > // RUN: %clang_cc1 -I. -x c++ -fmodule-name=test-base -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse Inputs/dependency-gen-base.modulemap -dependency-file %t-base.d -MT %t-base.pcm -o %t-base.pcm -fmodule-map-file-home-is-cwd
> > -// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse -fmodule-file=%t-base.pcm %s -dependency-file %t.d -MT %t.pcm -o %t.pcm -fmodule-map-file-home-is-cwd
> > +// RUN: %clang_cc1 -I. -x c++ -fmodule-name=test -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse -fmodule-file=%t-base.pcm %s -dependency-file %t.d -MT %t.pcm -o %t.pcm -fmodules-cache-path=%t -fmodule-map-file-home-is-cwd
> > // RUN: FileCheck %s < %t.d
> > module "test" {
> > export *
> >
> > Modified: cfe/trunk/test/Modules/stress1.cpp
> > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/stress1.cpp?rev=243657&r1=243656&r2=243657&view=diff <http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/stress1.cpp?rev=243657&r1=243656&r2=243657&view=diff>
> > ==============================================================================
> > --- cfe/trunk/test/Modules/stress1.cpp (original)
> > +++ cfe/trunk/test/Modules/stress1.cpp Thu Jul 30 11:44:07 2015
> > @@ -4,6 +4,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -emit-module -fmodule-name=m00 -o %t/m00.pcm \
> > // RUN: Inputs/stress1/module.modulemap
> > @@ -11,6 +12,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -emit-module -fmodule-name=m00 -o %t/m00_check.pcm \
> > // RUN: Inputs/stress1/module.modulemap
> > @@ -20,6 +22,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 -fdelayed-template-parsing \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -emit-module -fmodule-name=m01 -o %t/m01.pcm \
> > // RUN: Inputs/stress1/module.modulemap
> > @@ -27,6 +30,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 -fdelayed-template-parsing \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -emit-module -fmodule-name=m01 -o %t/m01_check.pcm \
> > // RUN: Inputs/stress1/module.modulemap
> > @@ -36,6 +40,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -emit-module -fmodule-name=m02 -o %t/m02.pcm \
> > // RUN: Inputs/stress1/module.modulemap
> > @@ -43,6 +48,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -emit-module -fmodule-name=m03 -o %t/m03.pcm \
> > // RUN: Inputs/stress1/module.modulemap
> > @@ -50,6 +56,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -fmodule-file=%t/m00.pcm \
> > // RUN: -fmodule-file=%t/m01.pcm \
> > @@ -61,6 +68,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -fmodule-file=%t/m00.pcm \
> > // RUN: -fmodule-file=%t/m01.pcm \
> > @@ -74,6 +82,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -fmodule-map-file=Inputs/stress1/module.modulemap \
> > // RUN: -fmodule-file=%t/m00.pcm \
> > @@ -86,6 +95,7 @@
> > // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \
> > // RUN: -I Inputs/stress1 \
> > // RUN: -fno-implicit-modules \
> > +// RUN: -fmodules-cache-path=%t \
> > // RUN: -fmodule-map-file-home-is-cwd \
> > // RUN: -fmodule-map-file=Inputs/stress1/module.modulemap \
> > // RUN: -fmodule-file=%t/m00.pcm \
> >
> >
> > _______________________________________________
> > cfe-commits mailing list
> > cfe-commits at cs.uiuc.edu <mailto:cfe-commits at cs.uiuc.edu>
> > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits <http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150730/17b6b279/attachment.html>
More information about the cfe-commits
mailing list