mirror of
https://github.com/boostorg/build.git
synced 2026-02-12 12:02:24 +00:00
Unbreak STLport and railsys test.
* tools/stlport.jam (stlport-target-class.generate): New method. * test/test_all.py: Run 'railsys' again. [SVN r19242]
This commit is contained in:
@@ -83,6 +83,20 @@ rule stlport-target-class ( project : headers ? : libraries ? : requirements * )
|
||||
self.libraries = $(libraries) ;
|
||||
|
||||
import feature project type errors generators ;
|
||||
import set : difference ;
|
||||
|
||||
rule generate ( property-set )
|
||||
{
|
||||
# Since this target is built with <stdlib>stlport, it will also
|
||||
# have <library>/stlport//stlport in requirements, which will
|
||||
# cause a loop in main target references. Remove that property
|
||||
# manually.
|
||||
|
||||
property-set = [ property-set.create [ difference
|
||||
[ $(property-set).raw ] : <library>/stlport//stlport ] ] ;
|
||||
return [ basic-target.generate $(property-set) ] ;
|
||||
}
|
||||
|
||||
|
||||
rule construct ( source-targets * : property-set )
|
||||
{
|
||||
|
||||
@@ -106,9 +106,9 @@ tests = [ "project_test1",
|
||||
if os.name == 'posix':
|
||||
tests.append("symlink")
|
||||
|
||||
#if 'QTDIR' in os.environ:
|
||||
# tests.append("railsys")
|
||||
#else:
|
||||
# print 'skipping railsys test since QTDIR environment variable is unset'
|
||||
if 'QTDIR' in os.environ:
|
||||
tests.append("railsys")
|
||||
else:
|
||||
print 'skipping railsys test since QTDIR environment variable is unset'
|
||||
|
||||
run_tests(critical_tests, tests)
|
||||
|
||||
Reference in New Issue
Block a user