diff --git a/.travis.yml b/.travis.yml index ee6321d3..5b38f3bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -320,9 +320,7 @@ script: - if [ $TEST_INTEL ]; then source ~/.bashrc; fi - |- echo "using $TOOLSET : : $COMPILER : $EXTRA_FLAGS $EXTRA_FLAGS ;" > ~/user-config.jam - - IFS=',' - - for CXXLOCAL in $CXXSTD; do (cd libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET cxxstd=$CXXLOCAL $CXXSTD_DIALECT && echo With Standard Version $CXXLOCAL && ./config_info_travis && rm ./config_info_travis) done - - unset IFS + - ./b2 libs/config/test//print_config_info toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT - ./b2 -j3 libs/config/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT notifications: diff --git a/appveyor.bat b/appveyor.bat deleted file mode 100644 index fb6d5279..00000000 --- a/appveyor.bat +++ /dev/null @@ -1,12 +0,0 @@ -IF NOT DEFINED CXXSTD ( -ECHO %ARGS:"=% -..\..\..\b2 config_info_travis_install %ARGS:"=% -config_info_travis -del config_info_travis.exe -) -IF DEFINED CXXSTD FOR %%A IN (%CXXSTD%) DO ( -ECHO %ARGS:"=% -..\..\..\b2 -a -d2 config_info_travis_install %ARGS:"=% cxxstd=%%A -config_info_travis -del config_info_travis.exe -) \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index eecf74f9..445ac97e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -69,5 +69,5 @@ build: off test_script: - cd libs\config\test - - ..\appveyor.bat + - ..\..\..\b2 print_config_info %ARGS% cxxstd=%CXXSTD% - ..\..\..\b2 -j3 %ARGS% cxxstd=%CXXSTD% diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 41aadf1b..ee765055 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,6 +8,7 @@ # the template defined in options_v2.jam. # +import feature ; import testing ; project @@ -114,7 +115,23 @@ obj has_clang_implicit_fallthrough : cmd_line_check.cpp : explicit has_clang_implicit_fallthrough ; -exe config_info_travis : config_info.cpp ; -install config_info_travis_install : config_info_travis : . ; -explicit config_info_travis_install ; +exe config_info_printer : config_info.cpp ; +explicit config_info_printer ; + +actions print-run +{ + echo With Standard Version $(STANDARD:E=default) + echo ===================================================================== + $(>) +} + +rule print-run ( target : sources * : properties * ) +{ + STANDARD on $(target) = [ feature.get-values : $(properties) ] ; +} + +notfile print_config_info : @print-run : config_info_printer ; +explicit print_config_info ; +# Backwards compatibility: +alias config_info_travis : print_config_info ; explicit config_info_travis ;