diff --git a/src/build/targets.jam b/src/build/targets.jam index 5e3393053..a6dac9f7a 100644 --- a/src/build/targets.jam +++ b/src/build/targets.jam @@ -580,6 +580,13 @@ class file-reference : abstract-target [ $(self.project).get source-location ] ] ; return [ path.exists [ path.native $(location) ] ] ; } + + # Returns the location of target. Needed by 'testing.jam' + rule location ( ) + { + return [ path.root $(self.name) + [ $(self.project).get source-location ] ] ; + } } diff --git a/src/tools/testing.jam b/src/tools/testing.jam index e0e4cbeb2..5fa39b449 100644 --- a/src/tools/testing.jam +++ b/src/tools/testing.jam @@ -162,8 +162,9 @@ rule dump-test ( target ) local type = [ $(target).type ] ; local name = [ $(target).name ] ; local project = [ $(target).project ] ; - local project-root = [ project.attribute $(project) project-root-module ] ; - local project-root-location = [ $(project-root).location ] ; + + local project-root = [ $(project).get project-root ] ; + local project-root-location = [ $(project-root).get-location ] ; local sources = [ $(target).sources ] ; local source-files ; @@ -174,7 +175,7 @@ rule dump-test ( target ) source-files += [ path.relative [ path.root [ $(s).location ] [ path.pwd ] ] - $(project-root-location) ] ; + [ path.root $(project-root-location) [ path.pwd ] ] ] ; } }