[Boost-commit] svn:boost r83852 - trunk/tools/build/v2/util

Subject: [Boost-commit] svn:boost r83852 - trunk/tools/build/v2/util
From: steven_at_[hidden]
Date: 2013-04-11 18:24:03

Author: steven_watanabe
Date: 2013-04-11 18:24:03 EDT (Thu, 11 Apr 2013)
New Revision: 83852
URL: http://svn.boost.org/trac/boost/changeset/83852

Log:
Fix unit-tests.
Text files modified: 
   trunk/tools/build/v2/util/path.jam |   144 ++++++++++++++++++++--------------------
   1 files changed, 72 insertions(+), 72 deletions(-)

Modified: trunk/tools/build/v2/util/path.jam
==============================================================================
--- trunk/tools/build/v2/util/path.jam	(original)
+++ trunk/tools/build/v2/util/path.jam	2013-04-11 18:24:03 EDT (Thu, 11 Apr 2013)
@@ -785,65 +785,65 @@
     local save-os = [ modules.peek path : os ] ;
     modules.poke path : os : NT ;
 
-    assert.result "foo/bar/giz" : make "foo/bar/giz" ;
-    assert.result "foo/bar/giz" : make "foo\\bar\\giz" ;
-    assert.result "foo" : make "foo/" ;
-    assert.result "foo" : make "foo\\" ;
-    assert.result "foo" : make "foo/." ;
-    assert.result "foo" : make "foo/bar/.." ;
-    assert.result "foo" : make "foo/bar/../" ;
-    assert.result "foo" : make "foo/bar/..\\" ;
-    assert.result "foo/bar" : make "foo/././././bar" ;
-    assert.result "/foo" : make "\\foo" ;
-    assert.result "/D:/My Documents" : make "D:\\My Documents" ;
-    assert.result "/c:/boost/tools/build/new/project.jam" : make
+    assert.result "foo/bar/giz" : make-NT "foo/bar/giz" ;
+    assert.result "foo/bar/giz" : make-NT "foo\\bar\\giz" ;
+    assert.result "foo" : make-NT "foo/" ;
+    assert.result "foo" : make-NT "foo\\" ;
+    assert.result "foo" : make-NT "foo/." ;
+    assert.result "foo" : make-NT "foo/bar/.." ;
+    assert.result "foo" : make-NT "foo/bar/../" ;
+    assert.result "foo" : make-NT "foo/bar/..\\" ;
+    assert.result "foo/bar" : make-NT "foo/././././bar" ;
+    assert.result "/foo" : make-NT "\\foo" ;
+    assert.result "/D:/My Documents" : make-NT "D:\\My Documents" ;
+    assert.result "/c:/boost/tools/build/new/project.jam" : make-NT
         "c:\\boost\\tools\\build\\test\\..\\new\\project.jam" ;
 
     # Test processing 'invalid' paths containing multiple successive path
     # separators.
-    assert.result "foo" : make "foo//" ;
-    assert.result "foo" : make "foo///" ;
-    assert.result "foo" : make "foo\\\\" ;
-    assert.result "foo" : make "foo\\\\\\" ;
-    assert.result "/foo" : make "//foo" ;
-    assert.result "/foo" : make "///foo" ;
-    assert.result "/foo" : make "\\\\foo" ;
-    assert.result "/foo" : make "\\\\\\foo" ;
-    assert.result "/foo" : make "\\/\\/foo" ;
-    assert.result "foo/bar" : make "foo//\\//\\\\bar//\\//\\\\\\//\\//\\\\" ;
-    assert.result "foo" : make "foo/bar//.." ;
-    assert.result "foo/bar" : make "foo/bar/giz//.." ;
-    assert.result "foo/giz" : make
+    assert.result "foo" : make-NT "foo//" ;
+    assert.result "foo" : make-NT "foo///" ;
+    assert.result "foo" : make-NT "foo\\\\" ;
+    assert.result "foo" : make-NT "foo\\\\\\" ;
+    assert.result "/foo" : make-NT "//foo" ;
+    assert.result "/foo" : make-NT "///foo" ;
+    assert.result "/foo" : make-NT "\\\\foo" ;
+    assert.result "/foo" : make-NT "\\\\\\foo" ;
+    assert.result "/foo" : make-NT "\\/\\/foo" ;
+    assert.result "foo/bar" : make-NT "foo//\\//\\\\bar//\\//\\\\\\//\\//\\\\" ;
+    assert.result "foo" : make-NT "foo/bar//.." ;
+    assert.result "foo/bar" : make-NT "foo/bar/giz//.." ;
+    assert.result "foo/giz" : make-NT
         "foo//\\//\\\\bar///\\\\//\\\\////\\/..///giz\\//\\\\\\//\\//\\\\" ;
-    assert.result "../../../foo" : make "..///.//..///.//..////foo///" ;
+    assert.result "../../../foo" : make-NT "..///.//..///.//..////foo///" ;
 
     # Test processing 'invalid' rooted paths with too many '..' path elements
     # that would place them before the root.
-    assert.result : make "/.." ;
-    assert.result : make "/../" ;
-    assert.result : make "/../." ;
-    assert.result : make "/.././" ;
-    assert.result : make "/foo/../bar/giz/.././././../../." ;
-    assert.result : make "/foo/../bar/giz/.././././../.././" ;
-    assert.result : make "//foo/../bar/giz/.././././../../." ;
-    assert.result : make "//foo/../bar/giz/.././././../.././" ;
-    assert.result : make "\\\\foo/../bar/giz/.././././../../." ;
-    assert.result : make "\\\\foo/../bar/giz/.././././../.././" ;
-    assert.result : make "/..///.//..///.//..////foo///" ;
-
-    assert.result "foo\\bar\\giz" : native "foo/bar/giz" ;
-    assert.result "foo" : native "foo" ;
-    assert.result "\\foo" : native "/foo" ;
-    assert.result "D:\\My Documents\\Work" : native "/D:/My Documents/Work" ;
+    assert.result : make-NT "/.." ;
+    assert.result : make-NT "/../" ;
+    assert.result : make-NT "/../." ;
+    assert.result : make-NT "/.././" ;
+    assert.result : make-NT "/foo/../bar/giz/.././././../../." ;
+    assert.result : make-NT "/foo/../bar/giz/.././././../.././" ;
+    assert.result : make-NT "//foo/../bar/giz/.././././../../." ;
+    assert.result : make-NT "//foo/../bar/giz/.././././../.././" ;
+    assert.result : make-NT "\\\\foo/../bar/giz/.././././../../." ;
+    assert.result : make-NT "\\\\foo/../bar/giz/.././././../.././" ;
+    assert.result : make-NT "/..///.//..///.//..////foo///" ;
+
+    assert.result "foo\\bar\\giz" : native-NT "foo/bar/giz" ;
+    assert.result "foo" : native-NT "foo" ;
+    assert.result "\\foo" : native-NT "/foo" ;
+    assert.result "D:\\My Documents\\Work" : native-NT "/D:/My Documents/Work" ;
 
     modules.poke path : os : UNIX ;
 
-    assert.result "foo/bar/giz" : make "foo/bar/giz" ;
-    assert.result "/sub1" : make "/sub1/." ;
-    assert.result "/sub1" : make "/sub1/sub2/.." ;
-    assert.result "sub1" : make "sub1/." ;
-    assert.result "sub1" : make "sub1/sub2/.." ;
-    assert.result "/foo/bar" : native "/foo/bar" ;
+    assert.result "foo/bar/giz" : make-UNIX "foo/bar/giz" ;
+    assert.result "/sub1" : make-UNIX "/sub1/." ;
+    assert.result "/sub1" : make-UNIX "/sub1/sub2/.." ;
+    assert.result "sub1" : make-UNIX "sub1/." ;
+    assert.result "sub1" : make-UNIX "sub1/sub2/.." ;
+    assert.result "/foo/bar" : native-UNIX "/foo/bar" ;
 
     modules.poke path : os : VMS ;
 
@@ -870,40 +870,40 @@
     #
     # Make portable paths
     #
-    assert.result "/disk:" : make "disk:" ;
-    assert.result "foo/bar/giz" : make "[.foo.bar.giz]" ;
-    assert.result "foo" : make "[.foo]" ;
-    assert.result "foo" : make "[.foo.bar.-]" ;
-    assert.result ".." : make "[.-]" ;
-    assert.result ".." : make "[-]" ;
-    assert.result "." : make "[]" ;
-    assert.result "giz.h" : make "giz.h" ;
-    assert.result "foo/bar/giz.h" : make "[.foo.bar]giz.h" ;
-    assert.result "/disk:/my_docs" : make "disk:[my_docs]" ;
-    assert.result "/disk:/boost/tools/build/new/project.jam" : make
+    assert.result "/disk:" : make-VMS "disk:" ;
+    assert.result "foo/bar/giz" : make-VMS "[.foo.bar.giz]" ;
+    assert.result "foo" : make-VMS "[.foo]" ;
+    assert.result "foo" : make-VMS "[.foo.bar.-]" ;
+    assert.result ".." : make-VMS "[.-]" ;
+    assert.result ".." : make-VMS "[-]" ;
+    assert.result "." : make-VMS "[]" ;
+    assert.result "giz.h" : make-VMS "giz.h" ;
+    assert.result "foo/bar/giz.h" : make-VMS "[.foo.bar]giz.h" ;
+    assert.result "/disk:/my_docs" : make-VMS "disk:[my_docs]" ;
+    assert.result "/disk:/boost/tools/build/new/project.jam" : make-VMS
         "disk:[boost.tools.build.test.-.new]project.jam" ;
 
     #
     # Special case (adds '.' to end of file w/o extension to disambiguate from
     # directory in portable path spec)
     #
-    assert.result "Jamfile." : make "Jamfile" ;
-    assert.result "dir/Jamfile." : make "[.dir]Jamfile" ;
-    assert.result "/disk:/dir/Jamfile." : make "disk:[dir]Jamfile" ;
+    assert.result "Jamfile." : make-VMS "Jamfile" ;
+    assert.result "dir/Jamfile." : make-VMS "[.dir]Jamfile" ;
+    assert.result "/disk:/dir/Jamfile." : make-VMS "disk:[dir]Jamfile" ;
 
     #
     # Make native paths
     #
-    assert.result "disk:" : native "/disk:" ;
-    assert.result "[.foo.bar.giz]" : native "foo/bar/giz" ;
-    assert.result "[.foo]" : native "foo" ;
-    assert.result "[.-]" : native ".." ;
-    assert.result "[.foo.-]" : native "foo/.." ;
-    assert.result "[]" : native "." ;
-    assert.result "disk:[my_docs.work]" : native "/disk:/my_docs/work" ;
-    assert.result "giz.h" : native "giz.h" ;
-    assert.result "disk:Jamfile." : native "/disk:Jamfile." ;
-    assert.result "disk:[my_docs.work]Jamfile." : native
+    assert.result "disk:" : native-VMS "/disk:" ;
+    assert.result "[.foo.bar.giz]" : native-VMS "foo/bar/giz" ;
+    assert.result "[.foo]" : native-VMS "foo" ;
+    assert.result "[.-]" : native-VMS ".." ;
+    assert.result "[.foo.-]" : native-VMS "foo/.." ;
+    assert.result "[]" : native-VMS "." ;
+    assert.result "disk:[my_docs.work]" : native-VMS "/disk:/my_docs/work" ;
+    assert.result "giz.h" : native-VMS "giz.h" ;
+    assert.result "disk:Jamfile." : native-VMS "/disk:Jamfile." ;
+    assert.result "disk:[my_docs.work]Jamfile." : native-VMS
         "/disk:/my_docs/work/Jamfile." ;
 
     modules.poke path : os : $(save-os) ;