Ugg… I did not. Seemingly my svn-property cleaning script isn’t working for some reason. If it hasn’t been done yet, I’ll clear the properties now.
From: Nico Weber [mailto:tha...@chromium.org] Sent: Wednesday, July 18, 2018 5:21 AM To: Keane, Erich <erich.ke...@intel.com> Cc: cfe-commits <cfe-commits@lists.llvm.org> Subject: Re: r336380 - Add PCH tests for R336379 I think normally we don't set all these svn properties. Did you set them intentionally? On Thu, Jul 5, 2018 at 1:28 PM Erich Keane via cfe-commits <cfe-commits@lists.llvm.org<mailto:cfe-commits@lists.llvm.org>> wrote: Author: erichkeane Date: Thu Jul 5 10:23:15 2018 New Revision: 336380 URL: http://llvm.org/viewvc/llvm-project?rev=336380&view=rev Log: Add PCH tests for R336379 I seemingly forgot the tests for this commit, added here. Added: cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp (with props) cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp (with props) cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp (with props) cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp (with props) cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp (with props) cfe/trunk/test/PCH/Inputs/pch-through1.h (with props) cfe/trunk/test/PCH/Inputs/pch-through2.h (with props) cfe/trunk/test/PCH/Inputs/pch-through3.h (with props) cfe/trunk/test/PCH/Inputs/pch-through4.h (with props) cfe/trunk/test/PCH/pch-through1.cpp (with props) cfe/trunk/test/PCH/pch-through2.cpp (with props) cfe/trunk/test/PCH/pch-through3a.cpp (with props) cfe/trunk/test/PCH/pch-through3b.cpp (with props) Added: cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp (added) +++ cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,2 @@ +void foo() { +} Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use0.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp (added) +++ cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,5 @@ +#include "Inputs/pch-through1.h" +#include "Inputs/pch-through3.h" +void foo() { + through2(0); +} Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use1.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp (added) +++ cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,3 @@ +void foo() { + through4(0); +} Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use2.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp (added) +++ cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,2 @@ +#define AFOO 0 +#include "Inputs/pch-through1.h" Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use3a.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp (added) +++ cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,3 @@ +#define AFOO 1 +#define BFOO 2 +#include "Inputs/pch-through1.h" Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through-use3b.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through1.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through1.h?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through1.h (added) +++ cfe/trunk/test/PCH/Inputs/pch-through1.h Thu Jul 5 10:23:15 2018 @@ -0,0 +1,2 @@ +#define THROUGH1 +int through1(int); Propchange: cfe/trunk/test/PCH/Inputs/pch-through1.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through1.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through1.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through2.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through2.h?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through2.h (added) +++ cfe/trunk/test/PCH/Inputs/pch-through2.h Thu Jul 5 10:23:15 2018 @@ -0,0 +1,2 @@ +#define THROUGH2 +int through2(int); Propchange: cfe/trunk/test/PCH/Inputs/pch-through2.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through2.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through2.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through3.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through3.h?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through3.h (added) +++ cfe/trunk/test/PCH/Inputs/pch-through3.h Thu Jul 5 10:23:15 2018 @@ -0,0 +1,2 @@ +#define THROUGH3 +int through3(int); Propchange: cfe/trunk/test/PCH/Inputs/pch-through3.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through3.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through3.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/Inputs/pch-through4.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/pch-through4.h?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/Inputs/pch-through4.h (added) +++ cfe/trunk/test/PCH/Inputs/pch-through4.h Thu Jul 5 10:23:15 2018 @@ -0,0 +1,2 @@ +#define THROUGH4 +int through4(int); Propchange: cfe/trunk/test/PCH/Inputs/pch-through4.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/Inputs/pch-through4.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/Inputs/pch-through4.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/pch-through1.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/pch-through1.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/pch-through1.cpp (added) +++ cfe/trunk/test/PCH/pch-through1.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,34 @@ +// Through header not found (anywhere) +// RUN: not %clang_cc1 -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-does-not-exist.h -o %t %s 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-TEST0A %s +// CHECK-TEST0A: fatal error:{{.*}} 'Inputs/pch-does-not-exist.h' +// CHECK-TEST0A-SAME: required for precompiled header not found + +// Through header not found in search path +// RUN: not %clang_cc1 -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-through2.h -o %t \ +// RUN: %S/Inputs/pch-through-use0.cpp 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-TEST0B %s +// CHECK-TEST0B: fatal error:{{.*}}'Inputs/pch-through2.h' +// CHECK-TEST0B-SAME: required for precompiled header not found + +// No #include of through header during pch create +// RUN: not %clang_cc1 -I %S -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-through2.h -o %t %s 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-TEST1A %s +// CHECK-TEST1A: fatal error:{{.*}} #include of +// CHECK-TEST1A-SAME: 'Inputs/pch-through2.h' not seen while attempting to +// CHECK-TEST1A-SAME: create precompiled header + +// checks for through headers that are also -includes +// RUN: %clang_cc1 -I %S -include Inputs/pch-through1.h \ +// RUN: -pch-through-header=Inputs/pch-through1.h -emit-pch -o %t.s3t1 %s +// RUN: %clang_cc1 -I %S -include Inputs/pch-through1.h \ +// RUN: -include Inputs/pch-through2.h -include Inputs/pch-through3.h \ +// RUN: -pch-through-header=Inputs/pch-through2.h -emit-pch -o %t.s3t2 %s +// Use through header from -includes +// RUN: %clang_cc1 -I %S -include Inputs/pch-through1.h \ +// RUN: -include Inputs/pch-through2.h -include Inputs/pch-through4.h \ +// RUN: -pch-through-header=Inputs/pch-through2.h -include-pch %t.s3t2 \ +// RUN: %S/Inputs/pch-through-use2.cpp -o %t.out Propchange: cfe/trunk/test/PCH/pch-through1.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/pch-through1.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/pch-through1.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/pch-through2.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/pch-through2.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/pch-through2.cpp (added) +++ cfe/trunk/test/PCH/pch-through2.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,28 @@ +// Create +// RUN: %clang_cc1 -I %S -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-through2.h -o %t.1 %s + +// Use +// RUN: %clang_cc1 -I %S -include-pch %t.1 \ +// RUN: -pch-through-header=Inputs/pch-through2.h %s + +// No #include of through header during pch use +// RUN: not %clang_cc1 -I %S -include-pch %t.1 \ +// RUN: -pch-through-header=Inputs/pch-through2.h \ +// RUN: %S/Inputs/pch-through-use1.cpp 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-TEST2A %s +// CHECK-TEST2A: fatal error:{{.*}} #include of +// CHECK-TEST2A-SAME: 'Inputs/pch-through2.h' not seen while attempting to +// CHECK-TEST2A-SAME: use precompiled header + +// check that pch only contains code before the through header. +// RUN: %clang_cc1 -I %S -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-through1.h -o %t.2 %s +// RUN: not %clang_cc1 -I %S -include-pch %t.2 \ +// RUN: -pch-through-header=Inputs/pch-through1.h \ +// RUN: %S/Inputs/pch-through-use1.cpp 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-TEST3 %s +// CHECK-TEST3: error: use of undeclared identifier 'through2' + +#include "Inputs/pch-through1.h" +#include "Inputs/pch-through2.h" Propchange: cfe/trunk/test/PCH/pch-through2.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/pch-through2.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/pch-through2.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/pch-through3a.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/pch-through3a.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/pch-through3a.cpp (added) +++ cfe/trunk/test/PCH/pch-through3a.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -verify -I %S -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-through1.h -o %t.s3at1 %s + +// RUN: %clang_cc1 -I %S -include-pch %t.s3at1 \ +// RUN: -pch-through-header=Inputs/pch-through1.h \ +// RUN: %S/Inputs/pch-through-use3a.cpp +//expected-no-diagnostics + +#define AFOO 0 +#include "Inputs/pch-through1.h" Propchange: cfe/trunk/test/PCH/pch-through3a.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/pch-through3a.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/pch-through3a.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cfe/trunk/test/PCH/pch-through3b.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/pch-through3b.cpp?rev=336380&view=auto ============================================================================== --- cfe/trunk/test/PCH/pch-through3b.cpp (added) +++ cfe/trunk/test/PCH/pch-through3b.cpp Thu Jul 5 10:23:15 2018 @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 -I %S -emit-pch \ +// RUN: -pch-through-header=Inputs/pch-through1.h -o %t.s3bt1 %s + +// RUN: %clang_cc1 -I %S -include-pch %t.s3bt1 \ +// RUN: -pch-through-header=Inputs/pch-through1.h \ +// RUN: %S/Inputs/pch-through-use3b.cpp 2>&1 | FileCheck %s + +//CHECK: warning: definition of macro 'AFOO' does not match definition in +//CHECK-SAME: precompiled header +//CHECK: warning: definition of macro 'BFOO' does not match definition in +//CHECK-SAME: precompiled header + +#define AFOO 0 +#include "Inputs/pch-through1.h" Propchange: cfe/trunk/test/PCH/pch-through3b.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cfe/trunk/test/PCH/pch-through3b.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL Propchange: cfe/trunk/test/PCH/pch-through3b.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org<mailto:cfe-commits@lists.llvm.org> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
