Quote from Simon commont on #bug66257 " I'd accept patches that move from checking DBUS_BUILD_TESTS to checking DBUS_ENABLE_EMBEDDED_TESTS (but only on master, and only a few related files at a time please - not all at once :-) " So this issue used to track patches to do that.
Created attachment 81623 [details] [review] [PATCH 1/5] tests to embedded tests: replaced in automake files
Created attachment 81624 [details] [review] [PATCH 2/5] tests to embedded tests: replaced in cmake files
Created attachment 81625 [details] [review] [PATCH 3/5] tests to embedded tests: replaced in dbus-daemon
Created attachment 81626 [details] [review] [PATCH 4/5] tests to embedded tests: replaced in libdbus
Created attachment 81627 [details] [review] [PATCH 5/5] tests to embedded tests: replaced in tools
Comment on attachment 81623 [details] [review] [PATCH 1/5] tests to embedded tests: replaced in automake files Review of attachment 81623 [details] [review]: ----------------------------------------------------------------- ::: configure.ac @@ -201,5 @@ > if test "x$enable_embedded_tests" = xyes; then > AC_DEFINE([DBUS_ENABLE_EMBEDDED_TESTS], [1], > [Define to build test code into the library and binaries]) > - AC_DEFINE([DBUS_BUILD_TESTS], [1], > - [Define to build test code into the library and binaries]) Not until all of its uses have been replaced.
Comment on attachment 81624 [details] [review] [PATCH 2/5] tests to embedded tests: replaced in cmake files Review of attachment 81624 [details] [review]: ----------------------------------------------------------------- ::: cmake/CMakeLists.txt @@ +234,5 @@ > > if(DBUS_BUILD_TESTS) > + set (DBUS_ENABLE_EMBEDDED_TESTS ON) > + set (DBUS_ENABLE_MODULAR_TESTS ON) > + add_definitions(-DDBUS_ENABLE_EMBEDDED_TESTS -DDBUS_ENABLE_MODULAR_TESTS) I don't think the CMake build system has the modular tests yet? But this seems OK to add.
With some re-ordering so it doesn't break at intermediate points, this all seems good, thanks. In git for 1.7.6. I would have preferred a sequence more like this, to make it obvious that each intermediate step was correct: * test DBUS_ENABLE_EMBEDDED_TESTS in C code, but keep defining DBUS_BUILD_TESTS too * test DBUS_ENABLE_EMBEDDED_TESTS in *.am and equivalent CMake conditionals * stop defining DBUS_BUILD_TESTS at all
(In reply to comment #8) > With some re-ordering so it doesn't break at intermediate points, this all > seems good, thanks. In git for 1.7.6. > > I would have preferred a sequence more like this, to make it obvious that > each intermediate step was correct: > > * test DBUS_ENABLE_EMBEDDED_TESTS in C code, but keep defining > DBUS_BUILD_TESTS too > * test DBUS_ENABLE_EMBEDDED_TESTS in *.am and equivalent CMake conditionals > * stop defining DBUS_BUILD_TESTS at all Yes, that's the recommended sequence, I was doing in that sequence because I did want a build failure if I lost any thing. :-).
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.