Change -verify mode to find the "expected-error" and "expected-warning" strings
with a raw lexer instead of a PP lexer.  This means that -verify doesn't scan
#include'd headers for expected-error/warning strings, and it also means that it
doesn't ignore them in #if 0.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59774 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Driver/env-include-paths.c b/test/Driver/env-include-paths.c
index ced2431..11876c3 100644
--- a/test/Driver/env-include-paths.c
+++ b/test/Driver/env-include-paths.c
@@ -2,8 +2,7 @@
 // RUN: env CPATH="" clang -fsyntax-only -verify -DAS_SOURCE %s &&
 // RUN: env CPATH="xyz:xyz" clang -fsyntax-only -verify -DAS_SOURCE %s &&
 // RUN: cd $(dirname %s) &&
-// RUN: env CPATH="xyz::xyz" clang -fsyntax-only -verify -DSHOULD_FIND -DAS_SOURCE %s &&
-// RUN: env CPATH="../Driver" clang -fsyntax-only -verify -DSHOULD_FIND -DAS_SOURCE %s
+// RUN: env CPATH="xyz::xyz" clang -fsyntax-only -verify -DSHOULD_FIND -DAS_SOURCE %s
 
 #ifdef AS_SOURCE
 #undef AS_SOURCE
@@ -12,16 +11,11 @@
 
 #ifdef SHOULD_FIND
 #include <env-include-paths.c>
-#else
-/* expected-error {{file not found}} */ #include <env-include-paths.c> 
 #endif
 
 #undef AS_INCLUDE
 
 #endif
 
-#ifdef AS_INCLUDE
 
 /* expected-warning {{Hello}} */ #warning "Hello"
-
-#endif