Skip to content

Commit e2bc2ff

Browse files
committed
Reapply "Fix init_script_test_helper not being cleaned properly."
Looks like 520144f was an attempt to fix init_script_test_helper from not being cleaned properly. This commit was reverted in ebd97bd, and another attempt was added in 9dc759f. However, the revert actually removed the entire `init_script_test_helper` binary from being compiled. This reapplying the first fix, and combining it with the second fix should do the trick. Found this while trying to clear the warning: ``` tests/unit/Makefile.am:402: warning: variable 'init_script_test_helper_SOURCES' is defined but no program or tests/unit/Makefile.am:402: library has 'init_script_test_helper' as canonical name (possible typo) ``` This reverts commit ebd97bd.
1 parent 5ed7b9d commit e2bc2ff

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tests/unit/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ nfs_test_LDADD = ../../libpromises/libpromises.la libtest.la
407407
init_script_test_helper_SOURCES = init_script_test_helper.c
408408
init_script_test.sh: init_script_test_helper
409409
CLEANFILES += init_script_test_helper
410+
noinst_PROGRAMS += init_script_test_helper
410411
endif
411412
EXTRA_DIST += init_script_test_helper.c
412413
EXTRA_DIST += init_script_test.sh

tests/unit/init_script_test.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ fi
9191
# Fail on any error.
9292
set -e
9393

94-
cp init_script_test_helper $CFTEST_PREFIX/bin/cf-test-execd
95-
cp init_script_test_helper $CFTEST_PREFIX/bin/cf-test-serverd
96-
cp init_script_test_helper $CFTEST_PREFIX/bin/cf-test-monitord
97-
cp init_script_test_helper $CFTEST_PREFIX/bin/cf-test-agent
94+
cp .libs/init_script_test_helper $CFTEST_PREFIX/bin/cf-test-execd
95+
cp .libs/init_script_test_helper $CFTEST_PREFIX/bin/cf-test-serverd
96+
cp .libs/init_script_test_helper $CFTEST_PREFIX/bin/cf-test-monitord
97+
cp .libs/init_script_test_helper $CFTEST_PREFIX/bin/cf-test-agent
9898

9999
touch $CFTEST_PREFIX/inputs/promises.cf
100100

0 commit comments

Comments
 (0)