mirror of
https://github.com/boostorg/config.git
synced 2026-04-29 10:34:15 +02:00
Move Boost.Config build rules into libs/config/test and fix the serialization build rules accordingly.
[SVN r44422]
This commit is contained in:
+10
-35
@@ -89,33 +89,9 @@ void write_config_test()
|
||||
ofs << "int main( int, char *[] )\n{\n" << config_test2.str() << " return error_count;\n}\n\n";
|
||||
}
|
||||
|
||||
void write_jamfile()
|
||||
{
|
||||
fs::ofstream ofs(config_path / "Jamfile");
|
||||
time_t t = std::time(0);
|
||||
ofs << "#\n# Regression test Jamfile for boost configuration setup.\n# *** DO NOT EDIT THIS FILE BY HAND ***\n"
|
||||
"# This file was automatically generated on " << std::ctime(&t);
|
||||
ofs << "# by libs/config/tools/generate.cpp\n"
|
||||
"# Copyright John Maddock.\n"
|
||||
"# Use, modification and distribution are subject to the \n"
|
||||
"# Boost Software License, Version 1.0. (See accompanying file \n"
|
||||
"# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n"
|
||||
"#\n# If you need to alter build preferences then set them in\n"
|
||||
"# the template defined in options.jam.\n#\n"
|
||||
"subproject libs/config/test ;\n"
|
||||
"# bring in the rules for testing\n"
|
||||
"import testing ./options ;\n\n"
|
||||
"run config_info.cpp <template>config_options ;\n"
|
||||
"run math_info.cpp <template>config_options : : : <borland><*><runtime-link>static ;\n"
|
||||
"run config_test.cpp <template>config_options ;\n"
|
||||
"run limits_test.cpp <template>config_test_options ;\n"
|
||||
"run abi/abi_test.cpp abi/main.cpp <template>config_options ;\n\n";
|
||||
ofs << jamfile.str() << std::endl;
|
||||
}
|
||||
|
||||
void write_jamfile_v2()
|
||||
{
|
||||
fs::ofstream ofs(config_path / "Jamfile.v2");
|
||||
fs::ofstream ofs(config_path / "all" / "Jamfile.v2");
|
||||
time_t t = std::time(0);
|
||||
ofs << "#\n# Regression test Jamfile for boost configuration setup.\n# *** DO NOT EDIT THIS FILE BY HAND ***\n"
|
||||
"# This file was automatically generated on " << std::ctime(&t);
|
||||
@@ -128,13 +104,13 @@ void write_jamfile_v2()
|
||||
"# the template defined in options_v2.jam.\n#\n"
|
||||
"path-constant DOT : . ;\n"
|
||||
"include $(DOT)/options_v2.jam ;\n\n"
|
||||
"run config_info.cpp : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;\n"
|
||||
"run config_info.cpp : : : <threading>multi : config_info_threaded ;\n"
|
||||
"run math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;\n"
|
||||
"run config_test.cpp : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;\n"
|
||||
"run config_test.cpp : : : <threading>multi : config_test_threaded ;\n"
|
||||
"run limits_test.cpp ../../test/build//boost_test_exec_monitor ;\n"
|
||||
"run abi/abi_test.cpp abi/main.cpp ;\n\n";
|
||||
"run ../config_info.cpp : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;\n"
|
||||
"run ../config_info.cpp : : : <threading>multi : config_info_threaded ;\n"
|
||||
"run ../math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;\n"
|
||||
"run ../config_test.cpp : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;\n"
|
||||
"run ../config_test.cpp : : : <threading>multi : config_test_threaded ;\n"
|
||||
"run ../limits_test.cpp ../../../test/build//boost_test_exec_monitor ;\n"
|
||||
"run ../abi/abi_test.cpp ../abi/main.cpp ;\n\n";
|
||||
ofs << jamfile_v2.str() << std::endl;
|
||||
|
||||
}
|
||||
@@ -265,8 +241,8 @@ void process_ipp_file(const fs::path& file, bool positive_test)
|
||||
"[ compile-fail " << negative_file.leaf() << " <template>config_options ] ;\n";
|
||||
|
||||
jamfile_v2 << "test-suite \"" << macro_name << "\" : \n"
|
||||
"[ run " << positive_file.leaf() << " ]\n"
|
||||
"[ compile-fail " << negative_file.leaf() << " ] ;\n";
|
||||
"[ run ../" << positive_file.leaf() << " ]\n"
|
||||
"[ compile-fail ../" << negative_file.leaf() << " ] ;\n";
|
||||
|
||||
}
|
||||
|
||||
@@ -301,7 +277,6 @@ int cpp_main(int argc, char* argv[])
|
||||
++i;
|
||||
}
|
||||
write_config_test();
|
||||
write_jamfile();
|
||||
write_jamfile_v2();
|
||||
write_config_info();
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user