Restructure testscript parser slightly

1 files changed, 12 insertions, 0 deletions

diff --git a/build2/test/script/script b/build2/test/script/script
index 5f6b861..aff5a59 100644
--- a/build2/test/script/script
+++ b/build2/test/script/script
@@ -5,6 +5,8 @@
 #ifndef BUILD2_TEST_SCRIPT_SCRIPT
 #define BUILD2_TEST_SCRIPT_SCRIPT
 
+#include <set>
+
 #include <build2/types>
 #include <build2/utility>
 
@@ -293,6 +295,11 @@ namespace build2
 
         location start_loc_;
         location end_loc_;
+
+        // Set of testscript files already included in this scope. Paths must
+        // be absolute and normalized.
+        //
+        std::set<path> testscripts_;
       };
 
       // group
@@ -364,6 +371,11 @@ namespace build2
                 testscript& script_target,
                 const dir_path& root_wd);
 
+        script (script&&) = default;
+        script (const script&) = delete;
+        script& operator= (script&&) = delete;
+        script& operator= (const script&) = delete;
+
       public:
         target& test_target;       // Target we are testing.
         testscript& script_target; // Target of the testscript file.