From 44e1022f8141bd57756c2be4277c728ca7443eb3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 16 Dec 2017 12:00:53 +0200 Subject: Redo string/stream representation of dir{} name/target Now instead of: dir{foo/bar/} We get: foo/dir{bar/} Which feels more consistent with how we print other names/targets. That is, "directory bar/ in directory foo/" similar how foo/exe{bar} is "executable bar in directory foo/". --- tests/variable/prerequisite-specific/testscript | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/variable/prerequisite-specific/testscript b/tests/variable/prerequisite-specific/testscript index c4993f2..ba21557 100644 --- a/tests/variable/prerequisite-specific/testscript +++ b/tests/variable/prerequisite-specific/testscript @@ -18,19 +18,19 @@ dir{x}: dir{c}: bar = [bool] true dump dir{x} EOI :5:1: dump: -% dir\{.+/x/\}:% +% .+/dir\{x/\}:% { fox = FOX } -% dir\{.+/x/\}: .+:dir\{a/\}:% +% .+/dir\{x/\}: .+:dir\{a/\}:% { foo = FOO } -% dir\{.+/x/\}: .+:dir\{b/\}:% +% .+/dir\{x/\}: .+:dir\{b/\}:% { fox = FOX FOX } -% dir\{.+/x/\}: .+:dir\{c/\}:% +% .+/dir\{x/\}: .+:dir\{c/\}:% { bar = [bool] true } @@ -43,20 +43,20 @@ dir{x} dir{y}: dir{a} dir{b}: foo = FOO dump dir{x} dir{y} EOI :2:1: dump: -% dir\{.+/x/\}: .+:dir\{a/\}:% +% .+/dir\{x/\}: .+:dir\{a/\}:% { foo = FOO } -% dir\{.+/x/\}: .+:dir\{b/\}:% +% .+/dir\{x/\}: .+:dir\{b/\}:% { foo = FOO } -% dir\{.+/y/\}: .+:dir\{a/\}:% +% .+/dir\{y/\}: .+:dir\{a/\}:% { foo = FOO } -% dir\{.+/y/\}: .+:dir\{b/\}:% +% .+/dir\{y/\}: .+:dir\{b/\}:% { foo = FOO } -- cgit v1.1