Move roundtrip tests to testscript

1 files changed, 5 insertions, 20 deletions

diff --git a/tests/roundtrip/buildfile b/tests/roundtrip/buildfile
index 01974c4..ab156e1 100644
--- a/tests/roundtrip/buildfile
+++ b/tests/roundtrip/buildfile
@@ -2,26 +2,11 @@
 # copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
-# @@ Hack until build2 supports multiple tests. Also remove .gitignore.
-#
-./: exe{attr-driver} exe{char-driver} exe{fup1-driver} exe{fup2-driver} \
-    exe{ns-driver}
-
-exe{attr-driver}: cxx{driver}
-exe{attr-driver}: test.roundtrip = attribute.xml
-
-exe{char-driver}: cxx{driver}
-exe{char-driver}: test.roundtrip = characters.xml
-
-exe{fup1-driver}: cxx{driver}
-exe{fup1-driver}: test.roundtrip = followup-1.xml
-
-exe{fup2-driver}: cxx{driver}
-exe{fup2-driver}: test.roundtrip = followup-2.xml
+import libs = libstudxml%lib{studxml}
 
-exe{ns-driver}: cxx{driver}
-exe{ns-driver}: test.roundtrip = namespace.xml
+exe{driver}: cxx{driver} $libs test{testscript}
 
-import libs = libstudxml%lib{studxml}
+define xml: file
+xml{*}: extension = xml
 
-exe{attr-driver char-driver fup1-driver fup2-driver ns-driver}: $libs
+./: exe{driver} xml{attribute characters followup-1 followup-2 namespace}