From f81ec08d6186271ebb33591ddf21590ff6a43dce Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 21 Apr 2016 14:53:49 +0200
Subject: Fix legacy stuff in tests

---
 tests/amalgam/libtest/buildfile            | 3 ---
 tests/amalgam/test/buildfile               | 3 ---
 tests/cli/lib/libtest/build/root.build     | 6 +++---
 tests/cli/lib/test/build/root.build        | 6 +++---
 tests/dist/simple/buildfile                | 3 ---
 tests/import/installed/buildfile           | 3 ---
 tests/install/lib/libtest/build/root.build | 8 ++++----
 tests/install/simple/buildfile             | 3 ---
 tests/postponed/buildfile                  | 2 --
 tests/simple/buildfile                     | 3 ---
 tests/test/generated/buildfile             | 3 ---
 tests/test/simple/buildfile                | 7 ++-----
 tests/variable/representation/buildfile    | 1 -
 13 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/tests/amalgam/libtest/buildfile b/tests/amalgam/libtest/buildfile
index 04c44da..70a1467 100644
--- a/tests/amalgam/libtest/buildfile
+++ b/tests/amalgam/libtest/buildfile
@@ -1,6 +1,3 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 lib{test}: cxx{test}
diff --git a/tests/amalgam/test/buildfile b/tests/amalgam/test/buildfile
index 5440dbf..e8af169 100644
--- a/tests/amalgam/test/buildfile
+++ b/tests/amalgam/test/buildfile
@@ -1,8 +1,5 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 import libs = amalgam-libtest%lib{test}
 
 exe{driver}: cxx{driver} $libs
diff --git a/tests/cli/lib/libtest/build/root.build b/tests/cli/lib/libtest/build/root.build
index f8d3d9e..c9ff67d 100644
--- a/tests/cli/lib/libtest/build/root.build
+++ b/tests/cli/lib/libtest/build/root.build
@@ -1,5 +1,5 @@
 using cxx
 
-hxx.ext =
-ixx.ext = ipp
-cxx.ext = cpp
+hxx{*}: extension =
+ixx{*}: extension = ipp
+cxx{*}: extension = cpp
diff --git a/tests/cli/lib/test/build/root.build b/tests/cli/lib/test/build/root.build
index 2dda614..636fd02 100644
--- a/tests/cli/lib/test/build/root.build
+++ b/tests/cli/lib/test/build/root.build
@@ -1,7 +1,7 @@
 using cxx
 
-hxx.ext = h
-ixx.ext = inl
-cxx.ext = C
+hxx{*}: extension = h
+ixx{*}: extension = inl
+cxx{*}: extension = C
 
 using cli
diff --git a/tests/dist/simple/buildfile b/tests/dist/simple/buildfile
index 27f143d..159fff3 100644
--- a/tests/dist/simple/buildfile
+++ b/tests/dist/simple/buildfile
@@ -1,7 +1,4 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 exe{driver}: cxx{driver} doc{README} file{bootstrap}
 exe{driver}: test.output = test.out
diff --git a/tests/import/installed/buildfile b/tests/import/installed/buildfile
index abdc151..be051b2 100644
--- a/tests/import/installed/buildfile
+++ b/tests/import/installed/buildfile
@@ -1,8 +1,5 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 import libs += lib{z}
 
 #lib{driver}: cxx{driver} $libs
diff --git a/tests/install/lib/libtest/build/root.build b/tests/install/lib/libtest/build/root.build
index 59c1e37..20536a2 100644
--- a/tests/install/lib/libtest/build/root.build
+++ b/tests/install/lib/libtest/build/root.build
@@ -1,11 +1,11 @@
 using cxx
 
-hxx.ext = hxx
-ixx.ext = ixx
-cxx.ext = cxx
+hxx{*}: extension = hxx
+ixx{*}: extension = ixx
+cxx{*}: extension = cxx
 
 tests/:
 {
-  test.exe = true
+  exe{*}: test = true
   install = false
 }
diff --git a/tests/install/simple/buildfile b/tests/install/simple/buildfile
index 6fe2576..5fc53d4 100644
--- a/tests/install/simple/buildfile
+++ b/tests/install/simple/buildfile
@@ -1,7 +1,4 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 exe{driver}: cxx{driver} hxx{utility} doc{README}
 exe{driver}: install = sbin
diff --git a/tests/postponed/buildfile b/tests/postponed/buildfile
index f08a020..53873aa 100644
--- a/tests/postponed/buildfile
+++ b/tests/postponed/buildfile
@@ -1,6 +1,4 @@
 using cxx
-hxx.ext = hxx
-cxx.ext = cxx
 
 exe{driver}: cxx{driver} fsdir{$out_root/out}
 
diff --git a/tests/simple/buildfile b/tests/simple/buildfile
index 986f391..ea1d8fa 100644
--- a/tests/simple/buildfile
+++ b/tests/simple/buildfile
@@ -1,6 +1,3 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 exe{driver}: cxx{driver}
diff --git a/tests/test/generated/buildfile b/tests/test/generated/buildfile
index ca06105..07a38d6 100644
--- a/tests/test/generated/buildfile
+++ b/tests/test/generated/buildfile
@@ -2,9 +2,6 @@
 #
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 exe{utility}: cxx{utility}
 exe{driver}: cxx{driver}
 exe{driver}: test.input = exe{utility}
diff --git a/tests/test/simple/buildfile b/tests/test/simple/buildfile
index 3b3598a..0162826 100644
--- a/tests/test/simple/buildfile
+++ b/tests/test/simple/buildfile
@@ -1,15 +1,12 @@
 using cxx
 
-hxx.ext = hxx
-cxx.ext = cxx
-
 lib{utility}: cxx{utility}
 exe{driver}: cxx{driver} #lib{utility}
 
 #exe{driver}: test.roundtrip = test.out
 
-test.exe = true
-test.exe.output = test.out
+exe{*}: test = true
+exe{*}: test.output = test.out
 
 .: lib{utility} exe{driver}
 #.: exe{driver}
diff --git a/tests/variable/representation/buildfile b/tests/variable/representation/buildfile
index 8410c96..9bb90d1 100644
--- a/tests/variable/representation/buildfile
+++ b/tests/variable/representation/buildfile
@@ -25,7 +25,6 @@ val += x%foo@y%bar
 val += x%foo/@y%bar/
 
 using cxx
-cxx.ext = cxx
 
 exe{driver}: cxx{driver}
 exe{driver}: test.output = test.out
-- 
cgit v1.1