diff --git a/.travis.yml b/.travis.yml index 7b9e9655..8e5b5946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -294,7 +294,9 @@ script: - if [ $TEST_INTEL ]; then source ~/.bashrc; fi - |- echo "using $TOOLSET : : $COMPILER : $EXTRA_FLAGS $EXTRA_FLAGS ;" > ~/user-config.jam - - ./b2 libs/config/test//print_config_info toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT + - 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 -j3 libs/config/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT notifications: diff --git a/appveyor.bat b/appveyor.bat new file mode 100644 index 00000000..fb6d5279 --- /dev/null +++ b/appveyor.bat @@ -0,0 +1,12 @@ +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 445ac97e..eecf74f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -69,5 +69,5 @@ build: off test_script: - cd libs\config\test - - ..\..\..\b2 print_config_info %ARGS% cxxstd=%CXXSTD% + - ..\appveyor.bat - ..\..\..\b2 -j3 %ARGS% cxxstd=%CXXSTD% diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index ee765055..41aadf1b 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,7 +8,6 @@ # the template defined in options_v2.jam. # -import feature ; import testing ; project @@ -115,23 +114,7 @@ obj has_clang_implicit_fallthrough : cmd_line_check.cpp : explicit has_clang_implicit_fallthrough ; -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 ; +exe config_info_travis : config_info.cpp ; +install config_info_travis_install : config_info_travis : . ; +explicit config_info_travis_install ; explicit config_info_travis ;