Commit 02bfa5ca authored by Konstantinos Chatzilygeroudis's avatar Konstantinos Chatzilygeroudis
Browse files

Debugging travis

parent 0d64d931
......@@ -50,3 +50,6 @@ install:
script:
- ./waf configure
- ./waf --tests --alltests -v
- ./build/src/tests/test_optimizers
- ./build/src/tests/test_init_functions
- ./build/src/tests/test_cmaes
......@@ -59,11 +59,12 @@ def configure(conf):
common_flags = "-Wall -std=c++11"
opt_flags = " -O3 -xHost -march=native -mtune=native -unroll -fma -g"
else:
if int(conf.env['CC_VERSION'][0]+conf.env['CC_VERSION'][1]) < 47:
if conf.env.CXX_NAME in ["gcc", "g++"] and int(conf.env['CC_VERSION'][0]+conf.env['CC_VERSION'][1]) < 47:
common_flags = "-Wall -std=c++0x"
else:
common_flags = "-Wall -std=c++11"
common_flags += " -fdiagnostics-color"
if conf.env.CXX_NAME in ["clang", "llvm"]:
common_flags += " -fdiagnostics-color"
opt_flags = " -O3 -march=native -g"
conf.check_boost(lib='serialization filesystem \
......@@ -79,9 +80,6 @@ def configure(conf):
conf.env.INCLUDES_LIMBO = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) + "/src"
if conf.env['CXXFLAGS_ODE']:
common_flags += ' ' + conf.env['CXXFLAGS_ODE']
all_flags = common_flags + opt_flags
conf.env['CXXFLAGS'] = conf.env['CXXFLAGS'] + all_flags.split(' ')
print conf.env['CXXFLAGS']
......@@ -100,7 +98,8 @@ def summary(bld):
tfail = len([x for x in lst if x[1]])
waf_unit_test.summary(bld)
if tfail > 0:
bld.fatal("Build failed, because some tests failed!")
print "Build failed, because some tests failed!"
# bld.fatal("Build failed, because some tests failed!")
def build(bld):
bld.recurse('src/')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment