build: rename HAVE_TESTS to WITH_TESTS
And rename a few waf targets for clarity and consistency
Change-Id: I7efad48a4edcbc311dba7981791249a4e0cc5678
diff --git a/wscript b/wscript
index 2d75f2d..0e35b2c 100644
--- a/wscript
+++ b/wscript
@@ -142,7 +142,7 @@
conf.check_boost(lib=boost_libs, mt=True)
- if any((conf.env.WITH_BENCHMARKS, conf.env.WITH_INTEGRATION_TESTS, conf.env.WITH_UNIT_TESTS)):
+ if conf.env.WITH_BENCHMARKS or conf.env.WITH_INTEGRATION_TESTS or conf.env.WITH_UNIT_TESTS:
conf.check_boost(lib='unit_test_framework', mt=True, uselib_store='BOOST_TESTS')
if conf.env.WITH_TOOLS:
@@ -161,7 +161,7 @@
conf.env.prepend_value('STLIBPATH', ['.'])
conf.define_cond('HAVE_STACKTRACE', conf.env.HAVE_STACKTRACE)
- conf.define_cond('HAVE_TESTS', conf.env.WITH_INTEGRATION_TESTS or conf.env.WITH_UNIT_TESTS)
+ conf.define_cond('WITH_TESTS', conf.env.WITH_INTEGRATION_TESTS or conf.env.WITH_UNIT_TESTS)
conf.define_cond('WITH_OSX_KEYCHAIN', conf.env.HAVE_OSX_FRAMEWORKS and conf.options.with_osx_keychain)
conf.define_cond('DISABLE_SQLITE3_FS_LOCKING', not conf.options.with_sqlite_locking)
conf.define('SYSCONFDIR', conf.env.SYSCONFDIR)