From 1cde23924b132b95f8ee7ba9328f5e2b21acaa5f Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 30 Jan 2018 22:07:52 +0100
Subject: [PATCH] test: Add and fix cpp1 suite

I messed up when adapting Anders's work in f58741b5 to the new test
layout.
---
 test/run              | 1 +
 test/suites/cpp1.bash | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/run b/test/run
index 10214b73d..f33237bbb 100755
--- a/test/run
+++ b/test/run
@@ -343,6 +343,7 @@ fi
 all_suites="
 base
 nocpp2
+cpp1
 multi_arch
 serialize_diagnostics
 debug_prefix_map
diff --git a/test/suites/cpp1.bash b/test/suites/cpp1.bash
index 6d07dcb02..965d46678 100644
--- a/test/suites/cpp1.bash
+++ b/test/suites/cpp1.bash
@@ -1,12 +1,12 @@
 SUITE_cpp1_PROBE() {
     touch test.c
     if $COMPILER_TYPE_GCC; then
-        if ! $UNCACHED_COMPILE -E -fdirectives-only test.c >&/dev/null; then
+        if ! $REAL_COMPILER -E -fdirectives-only test.c >&/dev/null; then
             echo "-fdirectives-only not supported by compiler"
             return
         fi
     elif $COMPILER_TYPE_CLANG; then
-        if ! $UNCACHED_COMPILE -E -frewrite-includes test.c >&/dev/null; then
+        if ! $REAL_COMPILER -E -frewrite-includes test.c >&/dev/null; then
             echo "-frewrite-includes not supported by compiler"
             return
         fi
@@ -38,7 +38,7 @@ SUITE_cpp1() {
     # -------------------------------------------------------------------------
     TEST "Base case"
 
-    $UNCACHED_COMPILE $cpp_flag -c -o reference_test1.o test1.c
+    $REAL_COMPILER $cpp_flag -c -o reference_test1.o test1.c
 
     $CCACHE_COMPILE $cpp_flag -c test1.c
     expect_stat 'cache hit (direct)' 0
-- 
2.47.2