diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-01-21 15:48:12 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-01-21 15:48:12 +0000 |
| commit | 2ebc5101ec6ba686c1caa9ee644cfba0f3430c81 (patch) | |
| tree | bcd4e966fbd941659e97fa6cd2ca1482e453a072 /configure.ac | |
| parent | 470d3f9d4bda5c1fd5410560b79bdcbb944715f0 (diff) | |
| parent | 1972390d42d7bf318e3783f9d6b0b4f748edb0d5 (diff) | |
| download | dbus-2ebc5101ec6ba686c1caa9ee644cfba0f3430c81.tar.gz | |
Merge branch 'test-bundling' into 'master'
Move some test code from dbus/ and bus/ into test/
Closes #223
See merge request dbus/dbus!1
Reviewed-by: @rhabacker
[smcv: Use ${TEST_DIR} as requested during review]
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a5a7fd3e..98afc6d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1565,7 +1565,7 @@ AC_DEFINE_UNQUOTED([DBUS_EXEEXT], ["$EXEEXT"], [Extension for executables, typically empty or .exe]) ## Export the non-setuid external helper -TEST_LAUNCH_HELPER_BINARY="$DBUS_PWD/bus/dbus-daemon-launch-helper-test$EXEEXT" +TEST_LAUNCH_HELPER_BINARY="$DBUS_TEST_EXEC/dbus-daemon-launch-helper-for-tests$EXEEXT" AC_SUBST(TEST_LAUNCH_HELPER_BINARY) AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", [Full path to the launch helper test program in the builddir]) |