From 9693eae0d4fddb148bd5fd663a7a2e802d3e4666 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 28 Jul 2017 14:32:38 +0200
Subject: Use utility library to arrange unit testing

---
 build2/buildfile | 18 +++++++++---------
 build2/dummy.cxx |  8 --------
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 build2/dummy.cxx

(limited to 'build2')

diff --git a/build2/buildfile b/build2/buildfile
index fc0632c..7514984 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -4,19 +4,19 @@
 
 import libs = libbutl%lib{butl}
 
-exe{b}: {hxx ixx txx cxx}{** -b-options -version -dummy} \
-        {hxx ixx cxx}{b-options} {hxx}{version}          \
-        liba{b} $libs
+exe{b}:  cxx{b} libu{b}
+
+libu{b}: {hxx ixx txx cxx}{** -b -b-options -version} \
+         {hxx ixx cxx}{b-options} {hxx}{version}      \
+         $libs
+
+cxx.poptions =+ "-I$out_root" "-I$src_root"
+libu{b}: cxx.export.poptions = "-I$out_root" "-I$src_root"
+libu{b}: cxx.export.libs = $libs
 
 hxx{version}: in{version} $src_root/file{manifest}
 hxx{version}: dist = true
 
-# Fake utility library (without it code generation does not work).
-#
-liba{b}: {cxx}{dummy}
-liba{b}: cxx.export.poptions = "-I$out_root" "-I$src_root"
-liba{b}: install = false
-
 # Pass our compiler target to be used as build2 host.
 #
 obj{b context}: cxx.poptions += -DBUILD2_HOST_TRIPLET=\"$cxx.target\"
diff --git a/build2/dummy.cxx b/build2/dummy.cxx
deleted file mode 100644
index bdea9a9..0000000
--- a/build2/dummy.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-// file      : build2/dummy.cxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-namespace build2
-{
-  void dummy () {}
-}
-- 
cgit v1.1