<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Jul 30, 2015, at 10:23 AM, Richard Smith <<a href="mailto:metafoo@gmail.com" class="">metafoo@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><p dir="ltr" class="">On Jul 30, 2015 10:01 AM, "Pete Cooper" <<a href="mailto:peter_cooper@apple.com" class="">peter_cooper@apple.com</a>> wrote:<br class="">
><br class="">
> Author: pete<br class="">
> Date: Thu Jul 30 11:44:07 2015<br class="">
> New Revision: 243657<br class="">
><br class="">
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D243657-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=ZBEHynsDnVXfCwJqn9HsoI_mcM0uPrK7SVzPnBvSDkI&s=SlYqbx2Gmrcd4RpHzMazhIZNvIPH9oo3RHJ1GWAJ-Ro&e=" class="">http://llvm.org/viewvc/llvm-project?rev=243657&view=rev</a><br class="">
> Log:<br class="">
> Add fmodules-cache-path to 2 tests which were missing it.<br class="">
><br class="">
> These tests were creating a modules.idx file in my clang checkout, not<br class="">
> the build directory or temp.<br class="">
><br class="">
> All the other tests in this directory use -fmodules-cache-path=%t so<br class="">
> updated these to match.</p><p dir="ltr" class="">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.</p></div></blockquote>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.</div><div><br class=""></div><div>Pete<br class=""><blockquote type="cite" class=""><div class=""><p dir="ltr" class="">> Modified:<br class="">
> cfe/trunk/test/Modules/dependency-gen.modulemap<br class="">
> cfe/trunk/test/Modules/stress1.cpp<br class="">
><br class="">
> Modified: cfe/trunk/test/Modules/dependency-gen.modulemap<br class="">
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_dependency-2Dgen.modulemap-3Frev-3D243657-26r1-3D243656-26r2-3D243657-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=ZBEHynsDnVXfCwJqn9HsoI_mcM0uPrK7SVzPnBvSDkI&s=u3XR7DQomeFAJigMtomgcAnGbXKC5YyaOgvlyQL5V5o&e=" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/dependency-gen.modulemap?rev=243657&r1=243656&r2=243657&view=diff</a><br class="">
> ==============================================================================<br class="">
> --- cfe/trunk/test/Modules/dependency-gen.modulemap (original)<br class="">
> +++ cfe/trunk/test/Modules/dependency-gen.modulemap Thu Jul 30 11:44:07 2015<br class="">
> @@ -1,7 +1,7 @@<br class="">
> // RUN: cd %S<br class="">
> // RUN: rm -f %t.cpm %t-base.pcm %t-base.d %t.d<br class="">
> // 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<br class="">
> -// 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<br class="">
> +// 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<br class="">
> // RUN: FileCheck %s < %t.d<br class="">
> module "test" {<br class="">
> export *<br class="">
><br class="">
> Modified: cfe/trunk/test/Modules/stress1.cpp<br class="">
> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_stress1.cpp-3Frev-3D243657-26r1-3D243656-26r2-3D243657-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=ZBEHynsDnVXfCwJqn9HsoI_mcM0uPrK7SVzPnBvSDkI&s=fpCwEboYqY8JGPwjAXaJDoP0zuMDIvRzdmsv79jdhrk&e=" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/stress1.cpp?rev=243657&r1=243656&r2=243657&view=diff</a><br class="">
> ==============================================================================<br class="">
> --- cfe/trunk/test/Modules/stress1.cpp (original)<br class="">
> +++ cfe/trunk/test/Modules/stress1.cpp Thu Jul 30 11:44:07 2015<br class="">
> @@ -4,6 +4,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -emit-module -fmodule-name=m00 -o %t/m00.pcm \<br class="">
> // RUN: Inputs/stress1/module.modulemap<br class="">
> @@ -11,6 +12,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -emit-module -fmodule-name=m00 -o %t/m00_check.pcm \<br class="">
> // RUN: Inputs/stress1/module.modulemap<br class="">
> @@ -20,6 +22,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 -fdelayed-template-parsing \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -emit-module -fmodule-name=m01 -o %t/m01.pcm \<br class="">
> // RUN: Inputs/stress1/module.modulemap<br class="">
> @@ -27,6 +30,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 -fdelayed-template-parsing \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -emit-module -fmodule-name=m01 -o %t/m01_check.pcm \<br class="">
> // RUN: Inputs/stress1/module.modulemap<br class="">
> @@ -36,6 +40,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -emit-module -fmodule-name=m02 -o %t/m02.pcm \<br class="">
> // RUN: Inputs/stress1/module.modulemap<br class="">
> @@ -43,6 +48,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -emit-module -fmodule-name=m03 -o %t/m03.pcm \<br class="">
> // RUN: Inputs/stress1/module.modulemap<br class="">
> @@ -50,6 +56,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -fmodule-file=%t/m00.pcm \<br class="">
> // RUN: -fmodule-file=%t/m01.pcm \<br class="">
> @@ -61,6 +68,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -fmodule-file=%t/m00.pcm \<br class="">
> // RUN: -fmodule-file=%t/m01.pcm \<br class="">
> @@ -74,6 +82,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -fmodule-map-file=Inputs/stress1/module.modulemap \<br class="">
> // RUN: -fmodule-file=%t/m00.pcm \<br class="">
> @@ -86,6 +95,7 @@<br class="">
> // RUN: %clang_cc1 -fmodules -x c++ -std=c++11 \<br class="">
> // RUN: -I Inputs/stress1 \<br class="">
> // RUN: -fno-implicit-modules \<br class="">
> +// RUN: -fmodules-cache-path=%t \<br class="">
> // RUN: -fmodule-map-file-home-is-cwd \<br class="">
> // RUN: -fmodule-map-file=Inputs/stress1/module.modulemap \<br class="">
> // RUN: -fmodule-file=%t/m00.pcm \<br class="">
><br class="">
><br class="">
> _______________________________________________<br class="">
> cfe-commits mailing list<br class="">
> <a href="mailto:cfe-commits@cs.uiuc.edu" class="">cfe-commits@cs.uiuc.edu</a><br class="">
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" class="">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br class="">
</p>
</div></blockquote></div><br class=""></body></html>