mirror of
https://github.com/boostorg/boost-ci.git
synced 2026-01-19 04:02:12 +00:00
42c162c87e
As pointed out by @sdarwin multiple values in `B2_DEFINES` led to a failing build as the scripts only supported a single value for the "new" var usages. This is a regression from the old usage where `B2_DEFINES: define=FOO=1 define=BAR=2` could be used. This is now fixed by a small parser function which generates multiple `define=*` entries and additionally now also supports spaces in the define values. Same is done for `B2_INCLUDE` which has the same issue. Also includes the change to the CI script from #177 and an additional test in test.cpp to verify that this works.
56 lines
1.7 KiB
C++
56 lines
1.7 KiB
C++
//
|
|
// Copyright (c) 2020 Mateusz Loskot <mateusz@loskot.net>
|
|
//
|
|
// Use, modification and distribution is subject to the Boost Software License,
|
|
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
|
// http://www.boost.org/LICENSE_1_0.txt)
|
|
//
|
|
|
|
// Use some STL components just to quick check compilers
|
|
#include <string>
|
|
#include <map>
|
|
#include <vector>
|
|
// Use our dummy lib
|
|
#include <boost/boost-ci/boost_ci.hpp>
|
|
// And the usual test framwork
|
|
#include <boost/core/lightweight_test.hpp>
|
|
// Check that including a file from the same directory works
|
|
#include "test2.hpp"
|
|
|
|
// Test of the CI scripts passing the correct defines
|
|
#ifdef BOOST_CI_TEST_DEFINES
|
|
#ifndef BOOST_NO_STRESS_TEST
|
|
#error "Missing define BOOST_NO_STRESS_TEST"
|
|
#endif
|
|
#ifndef BOOST_IMPORTANT
|
|
#error "Missing define BOOST_IMPORTANT"
|
|
#endif
|
|
#ifndef BOOST_ALSO_IMPORTANT
|
|
#error "Missing define BOOST_ALSO_IMPORTANT"
|
|
#endif
|
|
#define BOOST_CI_STRINGIZE_2(x) #x
|
|
#define BOOST_CI_STRINGIZE(x) BOOST_CI_STRINGIZE_2(x)
|
|
#endif
|
|
|
|
int main()
|
|
{
|
|
#ifdef BOOST_CI_TEST_DEFINES
|
|
const std::string macro_value = BOOST_CI_STRINGIZE(BOOST_ALSO_IMPORTANT);
|
|
BOOST_TEST_EQ(macro_value, "with space");
|
|
#endif
|
|
const bool isMSVC = MSVC_VALUE;
|
|
std::map<std::string, std::vector<int> > map;
|
|
map["result"].push_back(boost::boost_ci::get_answer());
|
|
// Specifically crafted condition to check for coverage from MSVC and non MSVC builds
|
|
if(isMSVC)
|
|
{
|
|
BOOST_TEST_EQ(boost::boost_ci::get_answer(), 21);
|
|
} else
|
|
{
|
|
BOOST_TEST_EQ(boost::boost_ci::get_answer(), 42);
|
|
}
|
|
BOOST_TEST_EQ(map["result"].size(), 1u);
|
|
BOOST_TEST_THROWS(boost::boost_ci::get_answer(-1), boost::boost_ci::example_error);
|
|
return boost::report_errors();
|
|
}
|