Merge branch 'refs/heads/t/clang_warning_fixes'

[paraslash.git] / t / makefile.test

diff --git a/t/makefile.test b/t/makefile.test
index d4aedf8035b1645da0b0fcb532e814d5d7ef10d6..a2bd4e538a473e6caea8342e6fdb2e102ccc6aac 100644 (file)
--- a/t/makefile.test
+++ b/t/makefile.test
@@ -6,8 +6,8 @@ trash_dir := $(test_dir)/trashes
 test_options := --executables-dir $(shell pwd)
 test_options += --results-dir $(results_dir)
 test_options += --trash-dir $(trash_dir)
-test_options += --executables "$(executables)"
-test_options += --objects "$(basename $(notdir $(all_objs)))"
+test_options += --executables "$(prefixed_executables)"
+test_options += --objects "$(basename $(all_objs))"
 
 ifdef V
        ifeq ("$(origin V)", "command line")
@@ -15,7 +15,7 @@ ifdef V
        endif
 endif
 
-tests := $(wildcard $(test_dir)/t[0-9][0-9][0-9][0-9]-*.sh)
+tests := $(sort $(wildcard $(test_dir)/t[0-9][0-9][0-9][0-9]-*.sh))
 
 test: $(tests)