Fix uses of BIN_PATH and DONTRUNVARIABLENAMESTOGETHERBECAUSEITMAKESTHEMREALLYHARDTOREAD

diff --git a/Make.inc.in b/Make.inc.in
index 537e1131921dd69a720013f5810e07afed1dde70..39ecc6c0f48be0e6f0e2f623d0c4f93c39f45488 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -171,8 +171,8 @@ ANALYZE.c       := @clang_path@
 #
 #  Have wrappers for the test tools, so that they run.
 #
-TESTBINDIR = ./$(BUILD_DIR)/bin/local
-TESTBIN    =  $(JLIBTOOL) --quiet --mode=execute $(TESTBINDIR)
+TEST_BIN_DIR = ./$(BUILD_DIR)/bin/local
+TEST_BIN    =  $(JLIBTOOL) --quiet --mode=execute $(TEST_BIN_DIR)
 
 #
 #  For creating documentation via doc/all.mk

diff --git a/src/tests/all.mk b/src/tests/all.mk
index 1145e383326832af215286201a5611fd5ac13ecb..e2f288c35e4c94f191eaf51e4c5f0a931d6eb24d 100644 (file)
--- a/src/tests/all.mk
+++ b/src/tests/all.mk
@@ -21,11 +21,11 @@ raddb/test.conf:
 # Don't molest STDERR as this may be used to receive output from a debugger.
 $(BUILD_DIR)/tests/radiusd-c:
        @printf "radiusd -C... "
-       ${Q}if ! ${TESTBIN}/radiusd -XCMd ./raddb -n debug -D ./share/dictionary -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
+       ${Q}if ! ${TEST_BIN}/radiusd -XCMd ./raddb -n debug -D ./share/dictionary -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \
                rm -f raddb/test.conf; \
                cat $(BUILD_DIR)/tests/radiusd.config.log; \
                echo "fail"; \
-               echo "${TESTBIN}/radiusd -XCMd ./raddb -n debug -D ./share/dictionary -n test"; \
+               echo "${TEST_BIN}/radiusd -XCMd ./raddb -n debug -D ./share/dictionary -n test"; \
                exit 1; \
        fi
        ${Q}rm -f raddb/test.conf

diff --git a/src/tests/auth/all.mk b/src/tests/auth/all.mk
index 8baa0e41b7a5954544774807b9d77088f4a3d091..838a1c8569d9d3bc860465bb80d0487486313121 100644 (file)
--- a/src/tests/auth/all.mk
+++ b/src/tests/auth/all.mk
@@ -92,13 +92,13 @@ AUTH_LIBS   := $(addsuffix .la,$(addprefix rlm_,$(AUTH_MODULES)))
 #  Otherwise, check the log file for a parse error which matches the
 #  ERROR line in the input.
 #
-$(OUTPUT)/%: $(DIR)/% $(OUTPUT)/%.attrs $(TESTBINDIR)/unit_test_module | $(AUTH_RADDB) $(AUTH_LIBS) build.raddb
+$(OUTPUT)/%: $(DIR)/% $(OUTPUT)/%.attrs $(TEST_BIN_DIR)/unit_test_module | $(AUTH_RADDB) $(AUTH_LIBS) build.raddb
        @echo "AUTH-TEST $(notdir $@)"
-       ${Q}if ! TESTDIR=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx > "$@.log" 2>&1 || ! test -f "$@"; then \
+       ${Q}if ! TESTDIR=$(notdir $@) $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx > "$@.log" 2>&1 || ! test -f "$@"; then \
                if ! grep ERROR $< 2>&1 > /dev/null; then \
                        cat $@.log; \
                        echo "# $@.log"; \
-                       echo "TESTDIR=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xxx > \"$@.log\" 2>&1"; \
+                       echo "TESTDIR=$(notdir $@) $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xxx > \"$@.log\" 2>&1"; \
                        rm -f $(BUILD_DIR)/tests/test.auth; \
                        exit 1; \
                fi; \
@@ -107,7 +107,7 @@ $(OUTPUT)/%: $(DIR)/% $(OUTPUT)/%.attrs $(TESTBINDIR)/unit_test_module | $(AUTH_
                if [ "$$EXPECTED" != "$$FOUND" ]; then \
                        cat $@.log; \
                        echo "# $@.log"; \
-                       echo "TESTDIR=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xxx > \"$@.log\" 2>&1"; \
+                       echo "TESTDIR=$(notdir $@) $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/auth/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xxx > \"$@.log\" 2>&1"; \
                        rm -f $(BUILD_DIR)/tests/test.auth; \
                        exit 1; \
                else \

diff --git a/src/tests/bin/all.mk b/src/tests/bin/all.mk
index 1f9dcc33ec288bfe731d59fa5e1e72aa8b02c22a..4dadac1e3bd0c0d5f934e106c91efbb42e11a68e 100644 (file)
--- a/src/tests/bin/all.mk
+++ b/src/tests/bin/all.mk
@@ -27,8 +27,8 @@ $(eval $(call TEST_BOOTSTRAP))
 #
 $(BUILD_DIR)/tests/bin/%: $(DIR)/% $(BUILD_DIR)/bin/% $(BUILD_DIR)/bin/local/%
        @echo "BIN-TEST $(notdir $@)"
-       ${Q}if ! TESTBIN="$(TESTBIN)" DICT_DIR="$(top_srcdir)/share/dictionary" $<; then \
-               echo TESTBIN=\"$(TESTBIN)\" DICT_DIR="$(top_srcdir)/share/dictionary" $<; \
+       ${Q}if ! TEST_BIN="$(TEST_BIN)" DICT_DIR="$(top_srcdir)/share/dictionary" $<; then \
+               echo TEST_BIN=\"$(TEST_BIN)\" DICT_DIR="$(top_srcdir)/share/dictionary" $<; \
                exit 1; \
        fi
        ${Q}touch $@

diff --git a/src/tests/bin/atomic_queue_test b/src/tests/bin/atomic_queue_test
index c2e4ebca7732909c4287345d2e31ac847f9fd3d0..7e6f5b6593c4e71f106993a6532f99a9a543e690 100755 (executable)
--- a/src/tests/bin/atomic_queue_test
+++ b/src/tests/bin/atomic_queue_test
@@ -2,5 +2,5 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/atomic_queue_test -h
-do_test $TESTBIN/atomic_queue_test -s 40480
+do_test $TEST_BIN/atomic_queue_test -h
+do_test $TEST_BIN/atomic_queue_test -s 40480

diff --git a/src/tests/bin/control_test b/src/tests/bin/control_test
index 8c0f9d1a8fb0da8a341aa3f0c93487549d483528..f9d9c47b32c4ffb51f5b349c8fe3a84a54f7942e 100755 (executable)
--- a/src/tests/bin/control_test
+++ b/src/tests/bin/control_test
@@ -2,5 +2,5 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/control_test -h
-do_test $TESTBIN/control_test -m 40480
+do_test $TEST_BIN/control_test -h
+do_test $TEST_BIN/control_test -m 40480

diff --git a/src/tests/bin/dhcpclient b/src/tests/bin/dhcpclient
index a4da7f865aac0e824075caf49e04bf2645d8b67e..d735f2f6d8c661712d49404adedea22cc87ec017 100755 (executable)
--- a/src/tests/bin/dhcpclient
+++ b/src/tests/bin/dhcpclient
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/dhcpclient -h
+do_test $TEST_BIN/dhcpclient -h

diff --git a/src/tests/bin/message_set_test b/src/tests/bin/message_set_test
index d2712f27377f3332a6e4153a04f5f1a54bb293ce..5e040bcd41927aba5f8a288b070b6815e977a18b 100755 (executable)
--- a/src/tests/bin/message_set_test
+++ b/src/tests/bin/message_set_test
@@ -2,5 +2,5 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/message_set_test -h
-do_test $TESTBIN/message_set_test -s caipirinha -tx
+do_test $TEST_BIN/message_set_test -h
+do_test $TEST_BIN/message_set_test -s caipirinha -tx

diff --git a/src/tests/bin/radclient b/src/tests/bin/radclient
index 3608e27d56aedaa3c6ca12ef60e95a49faf844be..3734bae0749f8b240ad9a79bc6ac4f8f777dd987 100755 (executable)
--- a/src/tests/bin/radclient
+++ b/src/tests/bin/radclient
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/radclient -h
+do_test $TEST_BIN/radclient -h

diff --git a/src/tests/bin/radict b/src/tests/bin/radict
index 13a0dc73afb52b73557a616223ba281d1a60f714..95d3a5655fb0794ea323ecb9a5bbdfa4023dde99 100755 (executable)
--- a/src/tests/bin/radict
+++ b/src/tests/bin/radict
@@ -2,5 +2,5 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/radict -h
-do_test $TESTBIN/radict -D $DICT_DIR User-Name
+do_test $TEST_BIN/radict -h
+do_test $TEST_BIN/radict -D $DICT_DIR User-Name

diff --git a/src/tests/bin/radmin b/src/tests/bin/radmin
index e147603b1687ac8581faa2a350ddf6991d8a5070..118d13f1bd047736f3cb850d109b232850adde28 100755 (executable)
--- a/src/tests/bin/radmin
+++ b/src/tests/bin/radmin
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/radmin -h
+do_test $TEST_BIN/radmin -h

diff --git a/src/tests/bin/radsniff b/src/tests/bin/radsniff
index 00aac2c445d574c1cc3c76befff4afdd1cdb175b..83901bea882d94058b0904e4b52952f9ea56c5cc 100755 (executable)
--- a/src/tests/bin/radsniff
+++ b/src/tests/bin/radsniff
@@ -2,8 +2,8 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/radsniff -h
+do_test $TEST_BIN/radsniff -h
 
 # list all interfaces
-do_test $TESTBIN/radsniff -a
+do_test $TEST_BIN/radsniff -a
 

diff --git a/src/tests/bin/radsnmp b/src/tests/bin/radsnmp
index 61d3671c720c6ddbbf9b0427927dea03b8a61fcc..d970487a9e4a11452514f81398ca9748c5df99a9 100755 (executable)
--- a/src/tests/bin/radsnmp
+++ b/src/tests/bin/radsnmp
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/radsnmp -h
+do_test $TEST_BIN/radsnmp -h

diff --git a/src/tests/bin/radwho b/src/tests/bin/radwho
index a9d8a313b51f8cba7deb4466e77ace50540e6e54..9d26ea67ba62ed17764fe32d0b15d7275f16f848 100755 (executable)
--- a/src/tests/bin/radwho
+++ b/src/tests/bin/radwho
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/radwho -h
+do_test $TEST_BIN/radwho -h

diff --git a/src/tests/bin/rbmonkey b/src/tests/bin/rbmonkey
index 991bb4f4450da29df4b5fbfc15e52238dd988293..9c64cecb367d4ead0e9a0d53721f9f8b75f5a011 100755 (executable)
--- a/src/tests/bin/rbmonkey
+++ b/src/tests/bin/rbmonkey
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/rbmonkey -h
+do_test $TEST_BIN/rbmonkey -h

diff --git a/src/tests/bin/ring_buffer_test b/src/tests/bin/ring_buffer_test
index 93be453a56e8377a0597ed8178d5afa2ce1c8342..924c1b9b9b7caf55d4eaa0a464c75cf20ba7ba59 100755 (executable)
--- a/src/tests/bin/ring_buffer_test
+++ b/src/tests/bin/ring_buffer_test
@@ -2,5 +2,5 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/ring_buffer_test
-do_test $TESTBIN/ring_buffer_test -s caipirinha -x -l 8096
+do_test $TEST_BIN/ring_buffer_test
+do_test $TEST_BIN/ring_buffer_test -s caipirinha -x -l 8096

diff --git a/src/tests/bin/rlm_redis_ippool_tool b/src/tests/bin/rlm_redis_ippool_tool
index cc7e97c6a5e0632315a767f9a858bae7beef9d68..dd4eea5add7ebad2275ad90e905badbff2d137da 100755 (executable)
--- a/src/tests/bin/rlm_redis_ippool_tool
+++ b/src/tests/bin/rlm_redis_ippool_tool
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/rlm_redis_ippool_tool -h
+do_test $TEST_BIN/rlm_redis_ippool_tool -h

diff --git a/src/tests/bin/smbencrypt b/src/tests/bin/smbencrypt
index 23801d6bfb78d7ae91f5bc731942adf4c70748dd..4632c959f4724ee0584ff4a42f2829591093b4a9 100755 (executable)
--- a/src/tests/bin/smbencrypt
+++ b/src/tests/bin/smbencrypt
@@ -3,22 +3,22 @@
 . src/tests/bin/lib.sh
 
 # -h help option?
-do_test $TESTBIN/smbencrypt -h
+do_test $TEST_BIN/smbencrypt -h
 
 # encrypt output?
 _pass_raw="caipirinha"
 
 _expect_lm_hash="1F2FD8485E0EC984E2000DE7B1D8469C"
-_test_lm_hash="$($TESTBIN/smbencrypt $_pass_raw 2>&1 | tail -1 | cut -f1)"
+_test_lm_hash="$($TEST_BIN/smbencrypt $_pass_raw 2>&1 | tail -1 | cut -f1)"
 
 if [ "$_expect_lm_hash" != "$_test_lm_hash" ]; then
-       echo "The $TESTBIN/smbencrypt $_pass_raw returns wrong result"
+       echo "The $TEST_BIN/smbencrypt $_pass_raw returns wrong result"
        exit 1
 fi
 
 _expect_nt_hash="2012E4A51A4AC527D1C88DBA8D64C878"
-_test_nt_hash="$($TESTBIN/smbencrypt $_pass_raw 2>&1 | tail -1 | cut -f2)"
+_test_nt_hash="$($TEST_BIN/smbencrypt $_pass_raw 2>&1 | tail -1 | cut -f2)"
 if [ "$_expect_nt_hash" != "$_test_nt_hash" ]; then
-       echo "The $TESTBIN/smbencrypt $_pass_raw returns wrong result"
+       echo "The $TEST_BIN/smbencrypt $_pass_raw returns wrong result"
        exit 1
 fi

diff --git a/src/tests/bin/unit_test_attribute b/src/tests/bin/unit_test_attribute
index 98727dfd39fa4669995746499d098abaa04230f8..52f889af6adc4dd7ead96fca59c0bd352aac059c 100755 (executable)
--- a/src/tests/bin/unit_test_attribute
+++ b/src/tests/bin/unit_test_attribute
@@ -3,11 +3,11 @@
 . src/tests/bin/lib.sh
 
 # help?
-do_test $TESTBIN/unit_test_attribute -h
+do_test $TEST_BIN/unit_test_attribute -h
 
 # execution?
 _t=./build/tests/bin/unit_test_attribute.tmp
 touch $_t
 cb_do_test="rm -fv $_t"
 
-do_test $TESTBIN/unit_test_attribute -D ${DICT_DIR} -Mx $_t
+do_test $TEST_BIN/unit_test_attribute -D ${DICT_DIR} -Mx $_t

diff --git a/src/tests/bin/unit_test_map b/src/tests/bin/unit_test_map
index 3d3d18604e732d7ba402476fa0fda9e621829cef..7210aa13673ed194d1696e075577b12906b2d195 100755 (executable)
--- a/src/tests/bin/unit_test_map
+++ b/src/tests/bin/unit_test_map
@@ -2,4 +2,4 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/unit_test_map -h
+do_test $TEST_BIN/unit_test_map -h

diff --git a/src/tests/bin/unit_test_module b/src/tests/bin/unit_test_module
index c070499bfc5ac2811b4ad7a3b4910a322d66bff4..3385423a4d782a5a9a778d584bebd1b8d212e615 100755 (executable)
--- a/src/tests/bin/unit_test_module
+++ b/src/tests/bin/unit_test_module
@@ -2,22 +2,22 @@
 
 . src/tests/bin/lib.sh
 
-do_test $TESTBIN/unit_test_module -h
+do_test $TEST_BIN/unit_test_module -h
 
-do_test $TESTBIN/unit_test_module -d src/tests/bin/ -D $DICT_DIR -xx -i - <<EOF
+do_test $TEST_BIN/unit_test_module -d src/tests/bin/ -D $DICT_DIR -xx -i - <<EOF
 User-Name = bob
 
 Packet-Type = Access-Accept
 EOF
 
-do_test $TESTBIN/unit_test_module -d src/tests/bin/ -D $DICT_DIR -xx -i - <<EOF
+do_test $TEST_BIN/unit_test_module -d src/tests/bin/ -D $DICT_DIR -xx -i - <<EOF
 Packet-Type = CoA-Request,
 User-Name = bob
 
 Packet-Type = CoA-ACK
 EOF
 
-do_test $TESTBIN/unit_test_module -d src/tests/bin/ -D $DICT_DIR -xx -i - -n dhcpv4 -p dhcpv4 <<EOF
+do_test $TEST_BIN/unit_test_module -d src/tests/bin/ -D $DICT_DIR -xx -i - -n dhcpv4 -p dhcpv4 <<EOF
 Packet-Type = DHCP-Discover,
 DHCP-Hardware-Type = Ethernet
 DHCP-Hardware-Address-Length = 6

diff --git a/src/tests/daemon/all.mk b/src/tests/daemon/all.mk
index c743f29b271611efdd04e5305f5157cb0903e887..a4348b736a3ed8d3952c211df55aecc8f5ec10f4 100644 (file)
--- a/src/tests/daemon/all.mk
+++ b/src/tests/daemon/all.mk
@@ -57,7 +57,7 @@ $(BUILD_DIR)/tests/daemon/:
 #  If the daemon changes, we kill any running tests, and start over.
 #  If the tmux session isn't running, that's OK, too.
 #
-$(BUILD_DIR)/tests/daemon/radiusd.version: $(TESTBINDIR)/radiusd
+$(BUILD_DIR)/tests/daemon/radiusd.version: $(TEST_BIN_DIR)/radiusd
        ${Q}tmux -L $(TMUX_KEY) send-key C-c 2>/dev/null || true
        ${Q}tmux -L $(TMUX_KEY) kill-server 2>/dev/null || true
        ${Q}rm -f $(BUILD_DIR)/tests/daemon/radiusd.log
@@ -68,7 +68,7 @@ $(BUILD_DIR)/tests/daemon/radiusd.version: $(TESTBINDIR)/radiusd
 #
 $(BUILD_DIR)/tests/daemon/radiusd.log: $(BUILD_DIR)/tests/daemon/radiusd.version
        ${Q}rm -f $@
-       ${Q}tmux -L $(TMUX_KEY) new-session -d './$(TESTBIN)/radiusd -i 127.0.0.1 -p $(TMUX_PORT) -fxx -d ./raddb -D share/dictionary -l $@'
+       ${Q}tmux -L $(TMUX_KEY) new-session -d './$(TEST_BIN)/radiusd -i 127.0.0.1 -p $(TMUX_PORT) -fxx -d ./raddb -D share/dictionary -l $@'
 
 radiusd.start: $(BUILD_DIR)/tests/daemon/radiusd.log
 

diff --git a/src/tests/dict/all.mk b/src/tests/dict/all.mk
index 402683ae34a1032083df424158e872d773c1f27c..9b1f3dcd930344b7489114920a0e0dd9b26c43a2 100644 (file)
--- a/src/tests/dict/all.mk
+++ b/src/tests/dict/all.mk
@@ -15,12 +15,12 @@ $(eval $(call TEST_BOOTSTRAP))
 #  The parser expects to read "foo/dictionary", so we make a
 #  "foo_dir" directory, and copy "foo" into "foo_dir/dictionary"
 #
-$(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_attribute
+$(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_attribute
        @echo "DICT-TEST $(notdir $@)"
        ${Q}mkdir -p $@_dir
        ${Q}cp $< $@_dir/dictionary
-       ${Q}if ! $(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d "$@_dir" -r "$@" -xxx "$(dir $<)/empty.txt" > "$@.log" 2>&1 || ! test -f "$@"; then \
-               echo "$(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d \"$@_dir\" -r \"$@\" \"$(dir $<)/empty.txt\""; \
+       ${Q}if ! $(TEST_BIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d "$@_dir" -r "$@" -xxx "$(dir $<)/empty.txt" > "$@.log" 2>&1 || ! test -f "$@"; then \
+               echo "$(TEST_BIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d \"$@_dir\" -r \"$@\" \"$(dir $<)/empty.txt\""; \
                cat "$@.log"; \
                rm -f $(BUILD_DIR)/tests/test.dict; \
                exit 1; \

diff --git a/src/tests/digest/all.mk b/src/tests/digest/all.mk
index 60363f505213b6f4b776d73bbe6624fcccef8bd4..f3980551aded3420365f947fca15075b4933b9de 100644 (file)
--- a/src/tests/digest/all.mk
+++ b/src/tests/digest/all.mk
@@ -35,13 +35,13 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
                cp -f $< $@.request;                                    \
                echo "Test-Name = \"$(TARGET)\"" >> $@.request;         \
                echo "Test-Number = \"$${_num}\"" >> $@.request;        \
-               if ! $(TESTBIN)/radclient -f $@.request -xF -d src/tests/digest/config -D share/dictionary 127.0.0.1:$(PORT) auth $(SECRET) > $@.out; then \
+               if ! $(TEST_BIN)/radclient -f $@.request -xF -d src/tests/digest/config -D share/dictionary 127.0.0.1:$(PORT) auth $(SECRET) > $@.out; then \
                        echo "FAILED";                                  \
                        cat $@.out;                                     \
                        rm -f $(BUILD_DIR)/tests/test.digest;           \
                        $(MAKE) --no-print-directory test.digest.radiusd_kill; \
                        echo "RADIUSD:   $(RADIUSD_RUN)";               \
-                       echo "RADCLIENT: $(TESTBIN)/radclient -f $@_request -xF -d src/tests/digest/config -D share/dictionary 127.0.0.1:$(PORT) auth $(SECRET)"; \
+                       echo "RADCLIENT: $(TEST_BIN)/radclient -f $@_request -xF -d src/tests/digest/config -D share/dictionary 127.0.0.1:$(PORT) auth $(SECRET)"; \
                        exit 1;                                         \
                fi;                                                     \
                touch $@;                                               \

diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk
index fc5a501d336b8a2e9b6261645e12ef8a0da5a7b5..9e1328e7951240332a877922392ceafdf7392436 100644 (file)
--- a/src/tests/eapol_test/all.mk
+++ b/src/tests/eapol_test/all.mk
@@ -17,7 +17,7 @@ TEST_PATH := ${top_srcdir}/src/tests/eapol_test
 CONFIG_PATH := $(TEST_PATH)/config
 RADIUS_LOG := $(OUTPUT)/radiusd.log
 GDB_LOG := $(OUTPUT)/gdb.log
-BIN_PATH := $(BUILD_DIR)/bin/local
+TEST_BIN := $(BUILD_DIR)/bin/local
 
 #
 #   We use the stock raddb modules to help detect typos and other issues

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index fa1dc4335ad242e21f24841cd2dc1c972dbcb1a5..45d30671d980193e6c3e2fc3389f404031707ef6 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -73,14 +73,14 @@ KEYWORD_LIBS        := $(addsuffix .la,$(addprefix rlm_,$(KEYWORD_MODULES))) rlm_exampl
 #  Otherwise, check the log file for a parse error which matches the
 #  ERROR line in the input.
 #
-$(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_module | $(KEYWORD_RADDB) $(KEYWORD_LIBS) build.raddb rlm_cache_rbtree.la rlm_test.la rlm_csv.la
+$(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_module | $(KEYWORD_RADDB) $(KEYWORD_LIBS) build.raddb rlm_cache_rbtree.la rlm_test.la rlm_csv.la
        @echo "KEYWORD-TEST $(notdir $@)"
        ${Q}cp $(if $(wildcard $<.attrs),$<.attrs,$(dir $<)/default-input.attrs) $@.attrs
-       ${Q}if ! KEYWORD=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/keywords/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx > "$@.log" 2>&1 || ! test -f "$@"; then \
+       ${Q}if ! KEYWORD=$(notdir $@) $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/keywords/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xx > "$@.log" 2>&1 || ! test -f "$@"; then \
                if ! grep ERROR $< 2>&1 > /dev/null; then \
                        cat $@.log; \
                        echo "# $@.log"; \
-                       echo "KEYWORD=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/keywords/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
+                       echo "KEYWORD=$(notdir $@) $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/keywords/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
                        rm -f $(BUILD_DIR)/tests/test.keywords; \
                        exit 1; \
                fi; \
@@ -89,7 +89,7 @@ $(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_module | $(KEYWORD_RADDB) $(KEYWOR
                if [ "$$EXPECTED" != "$$FOUND" ]; then \
                        cat $@.log; \
                        echo "# $@.log"; \
-                       echo "KEYWORD=$(notdir $@) $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/keywords/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
+                       echo "KEYWORD=$(notdir $@) $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/keywords/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
                        rm -f $(BUILD_DIR)/tests/test.keywords; \
                        exit 1; \
                else \

diff --git a/src/tests/map/all.mk b/src/tests/map/all.mk
index 0fc95fcdb8d3ba83825046514afeee4aa43d3ddb..b7f06f69abb1b28e7cbd2af23bbec3cc7f512b20 100644 (file)
--- a/src/tests/map/all.mk
+++ b/src/tests/map/all.mk
@@ -18,12 +18,12 @@ FILES  := \
 
 $(eval $(call TEST_BOOTSTRAP))
 
-MAP_UNIT := $(TESTBIN)/unit_test_map
+MAP_UNIT := $(TEST_BIN)/unit_test_map
 
 #
 #      Re-run the tests if the input file changes
 #
-$(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_map
+$(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_map
        @echo "MAP-TEST $(notdir $<)"
        ${Q}if ! $(MAP_UNIT) -d $(top_srcdir)/raddb -D $(top_srcdir)/share/dictionary -r "$@" "$<" > "$@.log" 2>&1 || ! test -f "$@"; then \
                if ! grep ERROR $< 2>&1 > /dev/null; then \

diff --git a/src/tests/modules/test.mk b/src/tests/modules/test.mk
index 04435c2e4e68e7ae6bce5bfd48419f8faef418bf..6f179a9867b36f71ac2a2533cf65c729b9ee2ea8 100644 (file)
--- a/src/tests/modules/test.mk
+++ b/src/tests/modules/test.mk
@@ -49,14 +49,14 @@ endef
 #  Otherwise, check the log file for a parse error which matches the
 #  ERROR line in the input.
 #
-$(BUILD_DIR)/tests/modules/%: src/tests/modules/%.unlang $(BUILD_DIR)/tests/modules/%.attrs $(TESTBINDIR)/unit_test_module | build.raddb
+$(BUILD_DIR)/tests/modules/%: src/tests/modules/%.unlang $(BUILD_DIR)/tests/modules/%.attrs $(TEST_BIN_DIR)/unit_test_module | build.raddb
        @echo "MODULE-TEST $(lastword $(subst /, ,$(dir $@))) $(basename $(notdir $@))"
        ${Q}mkdir -p $(dir $@)
-       ${Q}if ! MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xxx > "$@.log" 2>&1 || ! test -f "$@"; then \
+       ${Q}if ! MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xxx > "$@.log" 2>&1 || ! test -f "$@"; then \
                if ! grep ERROR $< 2>&1 > /dev/null; then \
                        cat "$@.log"; \
                        echo "# $@.log"; \
-                       echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
+                       echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
                        exit 1; \
                fi; \
                FOUND=$$(grep ^$< $@.log | head -1 | sed 's/:.*//;s/.*\[//;s/\].*//'); \
@@ -64,7 +64,7 @@ $(BUILD_DIR)/tests/modules/%: src/tests/modules/%.unlang $(BUILD_DIR)/tests/modu
                if [ "$$EXPECTED" != "$$FOUND" ]; then \
                        cat "$@.log"; \
                        echo "# $@.log"; \
-                       echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
+                       echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
                        exit 1; \
                else \
                        touch "$@"; \

diff --git a/src/tests/radclient/all.mk b/src/tests/radclient/all.mk
index 14599c2b1edb61c57e04a2cad9162c9ca08a5798..5ceb79b21e60ab615bc3a36df6657cc1a5bef7d6 100644 (file)
--- a/src/tests/radclient/all.mk
+++ b/src/tests/radclient/all.mk
@@ -41,13 +41,13 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
        $(eval ARGV     := $(shell grep "#.*ARGV:" $< | cut -f2 -d ':'))
        $(Q)echo "RADCLIENT-TEST INPUT=$(TARGET) ARGV=\"$(ARGV)\""
        $(Q)[ -f $(dir $@)/radiusd.pid ] || exit 1
-       $(Q)if ! $(TESTBIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET) 1> $(FOUND) 2>&1; then \
+       $(Q)if ! $(TEST_BIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET) 1> $(FOUND) 2>&1; then \
                echo "FAILED";                                              \
                cat $(FOUND);                                               \
                rm -f $(BUILD_DIR)/tests/test.radclient;                    \
                $(MAKE) --no-print-directory test.radclient.radiusd_kill;   \
                echo "RADIUSD:   $(RADIUSD_RUN)";                           \
-               echo "RADCLIENT: $(TESTBIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -xF -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET)"; \
+               echo "RADCLIENT: $(TEST_BIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -xF -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET)"; \
                exit 1;                                                     \
        fi
 #
@@ -64,7 +64,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
        $(Q)if [ -e "$(EXPECTED)" ] && ! cmp -s $(FOUND) $(EXPECTED); then  \
                echo "RADCLIENT FAILED $@";                                 \
                echo "RADIUSD:   $(RADIUSD_RUN)";                           \
-               echo "RADCLIENT: $(TESTBIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET)"; \
+               echo "RADCLIENT: $(TEST_BIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET)"; \
                echo "ERROR: File $(FOUND) is not the same as $(EXPECTED)"; \
                echo "If you did some update on the radclient code, please be sure to update the unit tests."; \
                echo "e.g: $(EXPECTED)";                                    \
@@ -75,7 +75,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
        elif [ -e "$(CMD_TEST)" ] && ! $(SHELL) $(CMD_TEST); then           \
                echo "RADCLIENT FAILED $@";                                 \
                echo "RADIUSD:   $(RADIUSD_RUN)";                           \
-               echo "RADCLIENT: $(TESTBIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET)"; \
+               echo "RADCLIENT: $(TEST_BIN)/radclient $(ARGV) -C $(RADCLIENT_CLIENT_PORT) -f $< -d src/tests/radclient/config -D share/dictionary 127.0.0.1:$(PORT) $(TYPE) $(SECRET)"; \
                echo "ERROR: The script $(CMD_TEST) can't validate the content of $(FOUND)"; \
                echo "If you did some update on the radclient code, please be sure to update the unit tests."; \
                rm -f $(BUILD_DIR)/tests/test.radclient;                    \

diff --git a/src/tests/radiusd.mk b/src/tests/radiusd.mk
index 378b4408aa770a365bddd34bf8abc100f073eebe..67123a47958d83aa138e97ee49b9eaa76b78d3e6 100644 (file)
--- a/src/tests/radiusd.mk
+++ b/src/tests/radiusd.mk
@@ -6,7 +6,6 @@
 #
 #  DIR       = src/tests/$target
 #  BUILD_DIR = build/
-#  BIN_PATH  = $(BUILD_DIR)/bin/local
 #
 #  - Defined by the target
 #
@@ -39,7 +38,7 @@
 include Make.inc
 
 define RADIUSD_SERVICE
-$$(eval RADIUSD_BIN := $(JLIBTOOL) --silent --mode=execute $$(BIN_PATH)/radiusd)
+$$(eval RADIUSD_BIN := $(JLIBTOOL) --silent --mode=execute $$(TEST_BIN)/radiusd)
 
 #
 #  Kill it.  We don't care if it failed or not.  However, we do care
@@ -96,6 +95,7 @@ ${2}/radiusd.pid: ${2}
                echo "FAILED STARTING RADIUSD"; \
                grep 'Error :' "${2}/radiusd.log"; \
                echo "Last entries in server log (${2}/radiusd.log):"; \
+               tail -n 100 "${2}/radiusd.log" 2> /dev/null; \
                echo "RADIUSD_RUN: $$(RADIUSD_RUN)"; \
        fi
 
@@ -107,7 +107,7 @@ $(TEST).radiusd_start: ${2}/radiusd.pid
 #  the output files depend on the radiusd binary.
 #
 ifneq "$(FILES.$(TEST))" ""
-$(foreach x, $(FILES.$(TEST)), $(eval $x: $(TESTBINDIR)/radiusd $(TESTBINDIR)/$(CLIENT) $(top_srcdir)/src/tests/$(subst test.,,$(TEST))/config/${1}.conf))
+$(foreach x, $(FILES.$(TEST)), $(eval $x: $(TEST_BIN_DIR)/radiusd $(TEST_BIN_DIR)/$(CLIENT) $(top_srcdir)/src/tests/$(subst test.,,$(TEST))/config/${1}.conf))
 endif
 
 endef

diff --git a/src/tests/radmin/all.mk b/src/tests/radmin/all.mk
index ae340ddacf9a1f033418e84e4f5619a79b60bd1d..88abdad2d957c6c8482d69b05350f31793db53f2 100644 (file)
--- a/src/tests/radmin/all.mk
+++ b/src/tests/radmin/all.mk
@@ -58,13 +58,13 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
        $(eval EXPECTED := $(patsubst %.txt,%.out,$<))
        $(eval FOUND    := $(patsubst %.txt,%.out,$@))
        $(eval TARGET   := $(patsubst %.txt,%,$(notdir $@)))
-       ${Q}if ! $(TESTBIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND) 2>&1; then\
+       ${Q}if ! $(TEST_BIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND) 2>&1; then\
                echo "--------------------------------------------------"; \
                tail -n 20 "$(RADMIN_RADIUS_LOG)"; \
                echo "Last entries in server log ($(RADMIN_RADIUS_LOG)):"; \
                echo "--------------------------------------------------"; \
                echo "RADIUSD: $(RADIUSD_RUN)"; \
-               echo "RADMIN : $(TESTBIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND)"; \
+               echo "RADMIN : $(TEST_BIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND)"; \
                rm -f $(BUILD_DIR)/tests/test.radmin; \
                $(MAKE) --no-print-directory test.radmin.radiusd_kill; \
                exit 1; \
@@ -72,7 +72,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
        if ! cmp -s $(FOUND) $(EXPECTED); then \
                echo "RADMIN FAILED $@"; \
                echo "RADIUSD: $(RADIUSD_RUN)"; \
-               echo "RADMIN : $(TESTBIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND)"; \
+               echo "RADMIN : $(TEST_BIN)/radmin -q -f $(RADMIN_SOCKET_FILE) < $< > $(FOUND)"; \
                echo "ERROR: File $(FOUND) is not the same as $(EXPECTED)"; \
                echo "If you did some update on the radmin code, please be sure to update the unit tests."; \
                echo "e.g: $(EXPECTED)"; \

diff --git a/src/tests/radsniff/all.mk b/src/tests/radsniff/all.mk
index c0d3a4f280f8648de16b65280637564b43120378..2893e82b31012946d0dbe454bedf4ab07c847bc9 100644 (file)
--- a/src/tests/radsniff/all.mk
+++ b/src/tests/radsniff/all.mk
@@ -30,7 +30,7 @@ $(OUTPUT)/%.pcap: $(DIR)/%.pcap.gz
 #
 #      Run the radsniff commands
 #
-$(OUTPUT)/%.txt: $(DIR)/%.txt $(TESTBINDIR)/radsniff $(PCAP_IN)
+$(OUTPUT)/%.txt: $(DIR)/%.txt $(TEST_BIN_DIR)/radsniff $(PCAP_IN)
        $(eval TARGET   := $(notdir $@))
        $(eval FOUND    := $(patsubst %.txt,%.out,$@))
        $(eval CMD_TEST := $(patsubst %.txt,%.cmd,$<))
@@ -41,10 +41,10 @@ $(OUTPUT)/%.txt: $(DIR)/%.txt $(TESTBINDIR)/radsniff $(PCAP_IN)
 #
 #      We need that 'TZ=UTC ...' to libpcap pass the same timestamp in anywhere.
 #
-       $(Q)if ! TZ='UTC' $(TESTBIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary 1> $(FOUND); then     \
+       $(Q)if ! TZ='UTC' $(TEST_BIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary 1> $(FOUND); then     \
                echo "FAILED";                                                                                \
                cat $(FOUND);                                                                                 \
-               echo "RADSNIFF: TZ='UTC' $(TESTBIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary" -xx;  \
+               echo "RADSNIFF: TZ='UTC' $(TEST_BIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary" -xx;  \
                rm -f $@;                                                                                     \
                exit 1;                                                                                       \
        fi
@@ -52,7 +52,7 @@ $(OUTPUT)/%.txt: $(DIR)/%.txt $(TESTBINDIR)/radsniff $(PCAP_IN)
                grep -v "^#" $(EXPECTED) > $(FOUND).result || true;                                           \
                if ! cmp $(FOUND) $(FOUND).result; then                                                       \
                        echo "RADSNIFF FAILED $@";                                                                \
-                       echo "RADSNIFF: $(TESTBIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary -xx";        \
+                       echo "RADSNIFF: $(TEST_BIN)/radsniff $(ARGV) -I $(PCAP_IN) -D share/dictionary -xx";        \
                        echo "ERROR: File $(FOUND).result is not the same as $(EXPECTED)";                        \
                        echo "If you did some update on the radsniff code, please be sure to update the unit tests."; \
                        echo "e.g: $(EXPECTED)";                                                                      \

diff --git a/src/tests/trie/test.mk b/src/tests/trie/test.mk
index 429fc7d27611d8a2d73ecfae6e0e7edc96652f0e..b553452a334c049d6ece561c2fc337448d403621 100644 (file)
--- a/src/tests/trie/test.mk
+++ b/src/tests/trie/test.mk
@@ -10,13 +10,13 @@ TRIE_FILES := $(subst $(DIR)/,,$(wildcard $(DIR)/*.txt))
 $(BUILD_DIR)/tests/trie:
        ${Q}mkdir -p $@
 
-$(BUILD_DIR)/tests/trie/trie-%: $(DIR)/% $(TESTBINDIR)/trie | $(BUILD_DIR)/tests/trie
+$(BUILD_DIR)/tests/trie/trie-%: $(DIR)/% $(TEST_BIN_DIR)/trie | $(BUILD_DIR)/tests/trie
        @echo TRIE-TEST $(notdir $@)
-       @$(TESTBIN)/trie $^ > $@
+       @$(TEST_BIN)/trie $^ > $@
 
-$(BUILD_DIR)/tests/trie/nopc-%: $(DIR)/% $(TESTBINDIR)/nopc | $(BUILD_DIR)/tests/trie
+$(BUILD_DIR)/tests/trie/nopc-%: $(DIR)/% $(TEST_BIN_DIR)/nopc | $(BUILD_DIR)/tests/trie
        @echo TRIE-NO-PC-TEST $(notdir $@)
-       @$(TESTBIN)/nopc $^ > $@
+       @$(TEST_BIN)/nopc $^ > $@
 
 #
 #  Get all of the unit test output files

diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk
index fb8f5b9d5a0a502e765ebeaf7f23b5609da1dbd9..1fc5fe0e831d0d12766504d37c808ed57713cac2 100644 (file)
--- a/src/tests/unit/all.mk
+++ b/src/tests/unit/all.mk
@@ -62,11 +62,11 @@ $(OUTPUT)/depends.mk: $(addprefix $(DIR)/,$(FILES)) | $(OUTPUT)
 #
 #  And the actual script to run each test.
 #
-$(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_attribute
+$(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_attribute
        $(eval DIR:=${top_srcdir}/src/tests/unit)
        @echo "UNIT-TEST $(lastword $(subst /, ,$(dir $@))) $(basename $(notdir $@))"
-       ${Q}if ! $(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d $(DIR) -r "$@" $<; then \
-               echo "$(TESTBIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d $(DIR) -r \"$@\" $<"; \
+       ${Q}if ! $(TEST_BIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d $(DIR) -r "$@" $<; then \
+               echo "$(TEST_BIN)/unit_test_attribute -D $(top_srcdir)/share/dictionary -d $(DIR) -r \"$@\" $<"; \
                rm -f $(BUILD_DIR)/tests/test.unit; \
                exit 1; \
        fi

diff --git a/src/tests/xlat/all.mk b/src/tests/xlat/all.mk
index bffa5d38c7d101c6004c878406d9283e42f778f5..43b33b4dd3a6b0246464494cf756b296ea22db65 100644 (file)
--- a/src/tests/xlat/all.mk
+++ b/src/tests/xlat/all.mk
@@ -20,11 +20,11 @@ $(eval $(call TEST_BOOTSTRAP))
 #
 #  And the actual script to run each test.
 #
-$(OUTPUT)/%: $(DIR)/% $(TESTBINDIR)/unit_test_module | build.raddb
+$(OUTPUT)/%: $(DIR)/% $(TEST_BIN_DIR)/unit_test_module | build.raddb
        @echo "XLAT-TEST $(notdir $@)"
-       ${Q}if ! $(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/xlat/ -r "$@" -i "$<" -xx -O xlat_only > "$@.log" 2>&1 || ! test -f "$@"; then \
+       ${Q}if ! $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/xlat/ -r "$@" -i "$<" -xx -O xlat_only > "$@.log" 2>&1 || ! test -f "$@"; then \
                cat $@.log; \
-               echo "./$(TESTBIN)/unit_test_module -D share/dictionary -d src/tests/xlat/ -r \"$@\" -i \"$<\" -xx -O xlat_only"; \
+               echo "./$(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/xlat/ -r \"$@\" -i \"$<\" -xx -O xlat_only"; \
                rm -f $(BUILD_DIR)/tests/test.xlat; \
                exit 1; \
        fi