From 5035f4ef68922ac758b1e4734e67d73c9228010b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Aug 2019 14:38:57 +0200
Subject: Introduce notion of build context

All non-const global state is now in class context and we can now have
multiple independent builds going on at the same time.
---
 libbuild2/function.test.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'libbuild2/function.test.cxx')

diff --git a/libbuild2/function.test.cxx b/libbuild2/function.test.cxx
index 2380987..bd0be62 100644
--- a/libbuild2/function.test.cxx
+++ b/libbuild2/function.test.cxx
@@ -10,6 +10,7 @@
 #include <libbuild2/scope.hxx>
 #include <libbuild2/parser.hxx>
 #include <libbuild2/context.hxx>
+#include <libbuild2/scheduler.hxx>
 #include <libbuild2/function.hxx>
 #include <libbuild2/variable.hxx>
 #include <libbuild2/diagnostics.hxx>
@@ -41,9 +42,12 @@ namespace build2
     //
     init_diag (1);
     init (nullptr, argv[0]);
-    reset (strings ()); // No command line variables.
+    scheduler sched (1);  // Serial execution.
+    context ctx (sched);
 
-    function_family f ("dummy");
+    auto& functions (ctx.functions);
+
+    function_family f (functions, "dummy");
 
     f["fail"]     = []()        {fail << "failed" << endf;};
     f["fail_arg"] = [](names a) {return convert<uint64_t> (move (a[0]));};
@@ -114,9 +118,9 @@ namespace build2
 
     try
     {
-      scope& s (*scope::global_);
+      scope& s (ctx.global_scope.rw ());
 
-      parser p;
+      parser p (ctx);
       p.parse_buildfile (cin, path ("buildfile"), s, s);
     }
     catch (const failed&)
-- 
cgit v1.1