renaming

* we don't need RADMIN_OUTPUT_DIR, we can just use OUTOUT
* it's better to use ".txt" for text files, even if they are
  input files
* similar ".out" instead of ".ret".  They're still text, but
  we care more to know that they're outputs
* test files don't need numbers.  If the tests are ordered,
  we should put that information into the tests instead of
  in the names
* test files don't need to be in a subdirectory.

diff --git a/src/tests/radmin/all.mk b/src/tests/radmin/all.mk
index 796d9be231dd6ad4c0103ed2fd8bcdb6189eb5a5..1b3997ad1734a77175e94eb143507f7c25b28138 100644 (file)
--- a/src/tests/radmin/all.mk
+++ b/src/tests/radmin/all.mk
@@ -10,17 +10,16 @@ TEST := test.radmin
 #
 #  The test files are files without extensions.
 #
-FILES  := $(subst $(DIR)/cmds/%,,$(wildcard $(DIR)/cmds/*.in))
+FILES  := $(subst $(DIR)/%,,$(wildcard $(DIR)/*.txt))
 OUTPUT := $(subst $(top_srcdir)/src,$(BUILD_DIR),$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 
 #
 #      Config settings
 #
 RADMIN_BIN         := $(TESTBINDIR)/radmin
-RADMIN_OUTPUT_DIR  := $(BUILD_DIR)/tests/radmin
-RADMIN_RADIUS_LOG  := $(RADMIN_OUTPUT_DIR)/radius.log
-RADMIN_GDB_LOG     := $(RADMIN_OUTPUT_DIR)/gdb.log
-RADMIN_SOCKET_FILE := $(RADMIN_OUTPUT_DIR)/control-socket.sock
+RADMIN_RADIUS_LOG  := $(OUTPUT)/radius.log
+RADMIN_GDB_LOG     := $(OUTPUT)/gdb.log
+RADMIN_SOCKET_FILE := $(OUTPUT)/control-socket.sock
 RADMIN_CONFIG_PATH := $(DIR)/config
 
 include src/tests/radiusd.mk
@@ -61,17 +60,17 @@ $(TEST): $(BUILD_DIR)/tests/$(TEST)
 #
 .PHONY: clean.$(TEST)
 clean.$(TEST):
-       ${Q}rm -rf $(RADMIN_OUTPUT_DIR)
+       ${Q}rm -rf $(OUTPUT)
 
 clean.test: clean.$(TEST)
 
 #
 #      Run the radmin commands against the radiusd.
 #
-$(RADMIN_OUTPUT_DIR)/%: $(DIR)/cmds/% test.radmin.radiusd_kill test.radmin.radiusd_start
-       $(eval EXPECTED := $(patsubst %.in,%.ret,$<))
-       $(eval FOUND    := $(patsubst %.in,%.ret,$@))
-       $(eval TARGET   := $(patsubst %.in,%,$(notdir $@)))
+$(BUILD_DIR)/tests/radmin/%: $(DIR)/% test.radmin.radiusd_kill test.radmin.radiusd_start
+       $(eval EXPECTED := $(patsubst %.txt,%.out,$<))
+       $(eval FOUND    := $(patsubst %.txt,%.out,$@))
+       $(eval TARGET   := $(patsubst %.txt,%,$(notdir $@)))
        ${Q}echo "RADMIN-TEST $(TARGET)"; \
        if ! $(RADMIN_BIN) -q -f $(RADMIN_SOCKET_FILE) > $(FOUND) < $<; then\
                echo "--------------------------------------------------"; \

diff --git a/src/tests/radmin/cmds/00-help.ret b/src/tests/radmin/help-all.out
similarity index 100%
rename from src/tests/radmin/cmds/00-help.ret
rename to src/tests/radmin/help-all.out

diff --git a/src/tests/radmin/cmds/00-help.in b/src/tests/radmin/help-all.txt
similarity index 100%
rename from src/tests/radmin/cmds/00-help.in
rename to src/tests/radmin/help-all.txt

diff --git a/src/tests/radmin/cmds/01-help-all.ret b/src/tests/radmin/help.out
similarity index 100%
rename from src/tests/radmin/cmds/01-help-all.ret
rename to src/tests/radmin/help.out

diff --git a/src/tests/radmin/cmds/01-help-all.in b/src/tests/radmin/help.txt
similarity index 100%
rename from src/tests/radmin/cmds/01-help-all.in
rename to src/tests/radmin/help.txt

diff --git a/src/tests/radmin/cmds/02-show-client-all-proto.ret b/src/tests/radmin/show-client-all-proto.out
similarity index 100%
rename from src/tests/radmin/cmds/02-show-client-all-proto.ret
rename to src/tests/radmin/show-client-all-proto.out

diff --git a/src/tests/radmin/cmds/02-show-client-all-proto.in b/src/tests/radmin/show-client-all-proto.txt
similarity index 100%
rename from src/tests/radmin/cmds/02-show-client-all-proto.in
rename to src/tests/radmin/show-client-all-proto.txt

diff --git a/src/tests/radmin/cmds/03-show-client-tcp-proto.ret b/src/tests/radmin/show-client-tcp-proto.out
similarity index 100%
rename from src/tests/radmin/cmds/03-show-client-tcp-proto.ret
rename to src/tests/radmin/show-client-tcp-proto.out

diff --git a/src/tests/radmin/cmds/03-show-client-tcp-proto.in b/src/tests/radmin/show-client-tcp-proto.txt
similarity index 100%
rename from src/tests/radmin/cmds/03-show-client-tcp-proto.in
rename to src/tests/radmin/show-client-tcp-proto.txt

diff --git a/src/tests/radmin/cmds/04-show-client-udp-proto.ret b/src/tests/radmin/show-client-udp-proto.out
similarity index 100%
rename from src/tests/radmin/cmds/04-show-client-udp-proto.ret
rename to src/tests/radmin/show-client-udp-proto.out

diff --git a/src/tests/radmin/cmds/04-show-client-udp-proto.in b/src/tests/radmin/show-client-udp-proto.txt
similarity index 100%
rename from src/tests/radmin/cmds/04-show-client-udp-proto.in
rename to src/tests/radmin/show-client-udp-proto.txt

diff --git a/src/tests/radmin/cmds/05-show-config-item1.ret b/src/tests/radmin/show-config-item1.out
similarity index 100%
rename from src/tests/radmin/cmds/05-show-config-item1.ret
rename to src/tests/radmin/show-config-item1.out

diff --git a/src/tests/radmin/cmds/05-show-config-item1.in b/src/tests/radmin/show-config-item1.txt
similarity index 100%
rename from src/tests/radmin/cmds/05-show-config-item1.in
rename to src/tests/radmin/show-config-item1.txt