4 files changed, 2 insertions, 231 deletions
diff --git a/tests/build/buildfile b/tests/build/buildfile
index 19ea46e..8d7e692 100644
--- a/tests/build/buildfile
+++ b/tests/build/buildfile
@@ -1,4 +1,3 @@
-d=path/
-
+d=
 .: $d
 include $d
diff --git a/tests/build/parser/driver.cxx b/tests/build/parser/driver.cxx
index 57d9267..fef2f41 100644
--- a/tests/build/parser/driver.cxx
+++ b/tests/build/parser/driver.cxx
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <iostream>
 
-#include <build/path>
+#include <build/types>
 #include <build/scope>
 #include <build/target>
 #include <build/native>
diff --git a/tests/build/path/buildfile b/tests/build/path/buildfile
deleted file mode 100644
index c2756b7..0000000
--- a/tests/build/path/buildfile
+++ /dev/null
@@ -1 +0,0 @@
-exe{driver}: cxx{driver ../../../build/path}
diff --git a/tests/build/path/driver.cxx b/tests/build/path/driver.cxx
deleted file mode 100644
index 58839d4..0000000
--- a/tests/build/path/driver.cxx
+++ /dev/null
@@ -1,227 +0,0 @@
-// file      : tests/build/path/driver.cxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#include <cassert>
-#include <iostream>
-
-#include <build/path>
-
-using namespace std;
-using namespace build;
-
-int
-main ()
-{
-  assert (path ("/").string () == "/");
-  assert (path ("//").string () == "/");
-  assert (path ("/tmp/foo/").string () == "/tmp/foo");
-#ifdef _WIN32
-  assert (path ("\\\\").string () == "\\");
-  assert (path ("/\\").string () == "/");
-  assert (path ("C:").string () == "C:");
-  assert (path ("C:\\").string () == "C:");
-  assert (path ("C:\\tmp\\foo\\").string () == "C:\\tmp\\foo");
-#endif
-
-  // abslote/relative/root
-  //
-#ifndef _WIN32
-  assert (path ("/").root ());
-  assert (path ("//").root ());
-  assert (path ("/").absolute ());
-  assert (path ("/foo/bar").absolute ());
-  assert (path ("bar/baz").relative ());
-#else
-  assert (path ("C:").root ());
-  assert (path ("C:\\").root ());
-  assert (path ("C:\\").absolute ());
-  assert (path ("C:\\foo\\bar").absolute ());
-  assert (path ("bar\\baz").relative ());
-#endif
-
-
-  // leaf
-  //
-#ifndef _WIN32
-  assert (path ("/").leaf ().string () == "");
-  assert (path ("/tmp").leaf ().string () == "tmp");
-  assert (path ("//tmp").leaf ().string () == "tmp");
-#else
-  assert (path ("C:").leaf ().string () == "C:");
-  assert (path ("C:\\tmp").leaf ().string () == "tmp");
-  assert (path ("C:\\\\tmp").leaf ().string () == "tmp");
-#endif
-
-  // directory
-  //
-#ifndef _WIN32
-  assert (path ("/").directory ().string () == "");
-  assert (path ("/tmp").directory ().string () == "/");
-  assert (path ("//tmp").directory ().string () == "/");
-#else
-  assert (path ("C:").directory ().string () == "");
-  assert (path ("C:\\tmp").directory ().string () == "C:");
-  assert (path ("C:\\\\tmp").directory ().string () == "C:");
-#endif
-
-  // base
-  //
-  assert (path ("/").base ().string () == "/");
-  assert (path ("/foo.txt").base ().string () == "/foo");
-  assert (path (".txt").base ().string () == ".txt");
-  assert (path ("/.txt").base ().string () == "/.txt");
-  assert (path ("foo.txt.orig").base ().string () == "foo.txt");
-#ifdef _WIN32
-  assert (path ("C:").base ().string () == "C:");
-  assert (path ("C:\\foo.txt").base ().string () == "C:\\foo");
-#endif
-
-  // iteration
-  //
-  {
-    path p;
-    assert (p.begin () == p.end ());
-  }
-  {
-    path p ("foo");
-    path::iterator i (p.begin ());
-    assert (i != p.end () && *i == "foo");
-    assert (++i == p.end ());
-  }
-  {
-    path p ("foo/bar");
-    path::iterator i (p.begin ());
-    assert (i != p.end () && *i == "foo");
-    assert (++i != p.end () && *i == "bar");
-    assert (++i == p.end ());
-  }
-  {
-    path p ("/foo/bar");
-    path::iterator i (p.begin ());
-    assert (i != p.end () && *i == "");
-    assert (++i != p.end () && *i == "foo");
-    assert (++i != p.end () && *i == "bar");
-    assert (++i == p.end ());
-  }
-  {
-    path p ("/");
-    path::iterator i (p.begin ());
-    assert (i != p.end () && *i == "");
-    assert (++i == p.end ());
-  }
-
-  // operator/
-  //
-#ifndef _WIN32
-  assert ((path ("/") / path ("tmp")).string () == "/tmp");
-  assert ((path ("foo") / path ("bar")).string () == "foo/bar");
-#else
-  assert ((path ("\\") / path ("tmp")).string () == "\\tmp");
-  assert ((path ("C:\\") / path ("tmp")).string () == "C:\\tmp");
-  assert ((path ("foo") / path ("bar")).string () == "foo\\bar");
-#endif
-
-  // normalize
-  //
-#ifndef _WIN32
-  assert (path ("../foo").normalize ().string () == "../foo");
-  assert (path ("..///foo").normalize ().string () == "../foo");
-  assert (path ("../../foo").normalize ().string () == "../../foo");
-  assert (path (".././foo").normalize ().string () == "../foo");
-  assert (path (".").normalize ().string () == "");
-  assert (path ("./..").normalize ().string () == "..");
-  assert (path ("../.").normalize ().string () == "..");
-  assert (path ("foo/./..").normalize ().string () == "");
-  assert (path ("/foo/./..").normalize ().string () == "/");
-  assert (path ("./foo").normalize ().string () == "foo");
-#else
-  assert (path ("../foo").normalize ().string () == "..\\foo");
-  assert (path ("..///foo").normalize ().string () == "..\\foo");
-  assert (path ("..\\../foo").normalize ().string () == "..\\..\\foo");
-  assert (path (".././foo").normalize ().string () == "..\\foo");
-  assert (path (".").normalize ().string () == "");
-  assert (path ("./..").normalize ().string () == "..");
-  assert (path ("../.").normalize ().string () == "..");
-  assert (path ("foo/./..").normalize ().string () == "");
-  assert (path ("C:/foo/./..").normalize ().string () == "C:");
-  assert (path ("./foo").normalize ().string () == "foo");
-
-  assert (path ("C:").normalize ().string () == "C:");
-  assert (path ("C:\\Foo12//Bar").normalize ().string () == "C:\\Foo12\\Bar");
-#endif
-
-  // comparison
-  //
-  assert (path ("./foo") == path("./foo"));
-  assert (path ("./boo") < path("./foo"));
-#ifdef _WIN32
-  assert (path (".\\foo") == path("./FoO"));
-  assert (path (".\\boo") < path(".\\Foo"));
-#endif
-
-  // posix_string
-  //
-  assert (path ("foo/bar/../baz").posix_string () == "foo/bar/../baz");
-#ifdef _WIN32
-  assert (path ("foo\\bar\\..\\baz").posix_string () == "foo/bar/../baz");
-  try
-  {
-    path ("c:\\foo\\bar\\..\\baz").posix_string ();
-    assert (false);
-  }
-  catch (const invalid_path&) {}
-#endif
-
-  // sub
-  //
-  assert (path ("foo").sub (path ("foo")));
-  assert (path ("foo/bar").sub (path ("foo/bar")));
-  assert (path ("foo/bar").sub (path ("foo")));
-  assert (!path ("foo/bar").sub (path ("bar")));
-  assert (path ("/foo/bar").sub (path ("/foo")));
-  assert (path ("/foo/bar/baz").sub (path ("/foo/bar")));
-  assert (!path ("/foo/bar/baz").sub (path ("/foo/baz")));
-#ifdef _WIN32
-  assert (path ("c:").sub (path ("c:")));
-  assert (!path ("c:").sub (path ("d:")));
-  assert (path ("c:\\foo").sub (path ("c:")));
-#else
-  assert (path ("/foo/bar/baz").sub (path ("/")));
-#endif
-
-  // relative
-  //
-  assert (path ("foo").relative (path ("foo")) == path ());
-  assert (path ("foo/bar").relative (path ("foo/bar")) == path ());
-  assert (path ("foo/bar/baz").relative (path ("foo/bar")) == path ("baz"));
-  assert (path ("foo/bar/baz").relative (path ("foo/bar/buz")).
-    posix_string () == "../baz");
-  assert (path ("foo/bar/baz").relative (path ("foo/biz/baz")).
-    posix_string () == "../../bar/baz");
-  assert (path ("foo/bar/baz").relative (path ("fox/bar/baz")).
-    posix_string () == "../../../foo/bar/baz");
-#ifdef _WIN32
-  assert (path ("c:\\foo\\bar").relative (path ("c:\\fox\\bar")) ==
-          path ("..\\..\\foo\\bar"));
-  try
-  {
-    path ("c:\\foo\\bar").relative (path ("d:\\fox\\bar"));
-    assert (false);
-  }
-  catch (const invalid_path&) {}
-#else
-  assert (path ("/foo/bar/baz").relative (path ("/")) ==
-          path ("foo/bar/baz"));
-#endif
-
-  /*
-  path p ("../foo");
-  p.complete ();
-
-  cerr << path::current () << endl;
-  cerr << p << endl;
-  p.normalize ();
-  cerr << p << endl;
-  */
-}