From 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 20 Jan 2018 13:46:11 +0200
Subject: Get rid of action rule override semantics

Instead we now have two more or less separate match states for outer and
inner parts of an action.
---
 tests/cc/preprocessed/testscript  | 2 +-
 tests/test/config-test/testscript | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/cc/preprocessed/testscript b/tests/cc/preprocessed/testscript
index fb69e65..644e121 100644
--- a/tests/cc/preprocessed/testscript
+++ b/tests/cc/preprocessed/testscript
@@ -12,7 +12,7 @@ test.arguments = config.cxx="$recall($cxx.path)" update
 # trace: cxx::compile::extract_(headers|modules): target: .../obje{(test).o...}
 #
 filter = sed -n -e \
-  \''s/^trace: cxx::compile::extract_([^:]+): target:[^{]+\{([^.]+).*/\1 \2/p'\'
+  \''s/^trace: cxx::compile_rule::extract_([^:]+): target:[^{]+\{([^.]+).*/\1 \2/p'\'
 
 +cat <<EOI >=build/root.build
 cxx.std = latest
diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript
index 0d08eb0..7423322 100644
--- a/tests/test/config-test/testscript
+++ b/tests/test/config-test/testscript
@@ -82,8 +82,7 @@ EOI
 +touch proj/units/simple/driver
 +cat <<EOI >=proj/units/simple/buildfile
 driver = $src_root/../../exe{driver}
-#@@ TMP file{driver}@./: $driver
-./: file{driver} $driver
+file{driver}@./: $driver
 file{driver}@./: test = $driver
 file{driver}@./: test.arguments = units/simple
 EOI
-- 
cgit v1.1