diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-03 17:54:02 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:37 +0200 |
commit | 554475390b6d2912614778fe50788a09f99ac6a4 (patch) | |
tree | 2cc756aa363f0697291b4cbf8e7a9365bf65629b /build2/test/script/script | |
parent | 7ebe4aa8d07e8845f1669e2d43fbe6071d3ee463 (diff) |
Implement testscript inclusion support
Diffstat (limited to 'build2/test/script/script')
-rw-r--r-- | build2/test/script/script | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/build2/test/script/script b/build2/test/script/script index aff5a59..c5be0c0 100644 --- a/build2/test/script/script +++ b/build2/test/script/script @@ -256,6 +256,11 @@ namespace build2 lookup find (const variable&) const; + // As above but only look for buildfile variables. + // + lookup + find_in_buildfile (const string&) const; + // Return a value suitable for assignment. If the variable does not // exist in this scope's map, then a new one with the NULL value is // added and returned. Otherwise the existing value is returned. @@ -295,11 +300,6 @@ 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 @@ -379,6 +379,16 @@ namespace build2 public: target& test_target; // Target we are testing. testscript& script_target; // Target of the testscript file. + + // Pre-parse data. + // + private: + friend class parser; + + // Testscript file paths. Specifically, replay_token::file points to + // these paths. + // + std::set<path> paths_; }; } } |