import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / tools / build / test / core-language / test.jam

diff --git a/ceph/src/boost/tools/build/test/core-language/test.jam b/ceph/src/boost/tools/build/test/core-language/test.jam
index 778bd5723525f18f40dbe0f9e7c849ae1b83d650..073810218d319cf78085973896fdc53e3464535c 100644 (file)
--- a/ceph/src/boost/tools/build/test/core-language/test.jam
+++ b/ceph/src/boost/tools/build/test/core-language/test.jam
@@ -11,7 +11,7 @@ rule show-result ( id : test-result )
 {
     if ! ( --quiet in $(ARGV) )
     {
-        ECHO $(test-result): $(id) ;
+        ECHO "$(test-result):" $(id) ;
     }
     $(test-result) = [ CALC $($(test-result)) + 1 ] ;
 }
@@ -19,16 +19,19 @@ rule show-result ( id : test-result )
 rule check-equal ( id : values * : expected * )
 {
     local test-result ;
+    local location = [ BACKTRACE ] ;
+    location = $(location[5-6]) ;
+    location = "$(location[1]):$(location[2])" ;
     if x$(values) = x$(expected)
     {
         test-result = passed ;
     }
     else
     {
-        ECHO error: "[" $(values) "] != [" $(expected) "]" ;
+        ECHO "error:" "[" $(values) "] != [" $(expected) "]" ;
         test-result = failed ;
     }
-    show-result $(id) : $(test-result) ;
+    show-result "$(location):$(id)" : $(test-result) ;
 }
 
 rule mark-order ( id : result * )
@@ -1446,6 +1449,11 @@ check-equal normalize-path-invalid : : [ NORMALIZE_PATH "/foo/bar/../baz/../../.
 check-equal normalize-path-invalid : : [ NORMALIZE_PATH "/../for/././../././bar/././../././.." ] ;
 check-equal normalize-path-invalid : : [ NORMALIZE_PATH "/../foo/bar" ] ;
 
+check-equal normalize-path : "../d" : [ NORMALIZE_PATH "../d" ] ;
+check-equal normalize-path : "../d" : [ NORMALIZE_PATH ".." "d" ] ;
+check-equal normalize-path : "../../d" : [ NORMALIZE_PATH ".." ".." "d" ] ;
+check-equal normalize-path : "../d" : [ NORMALIZE_PATH "" ".." "d" ] ;
+
 }
 
 # Test W32_GETREGNAMES