tests: rename some tests to make .gitignore effective.

2019-06-20 12:50:10 +02:00 · 2019-06-20 12:50:10 +02:00 · a3209f4b57
commit a3209f4b57
parent 016a06754c
18 changed files with 18 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@ -30,7 +30,9 @@ doc/xbps_api_doxyfile
 ftperr.h
 httperr.h
 tests/*/*/*/*_test
+tests/*/*/*/*_tests
 tests/*/*/*_test
+tests/*/*/*_tests
 include/xbps.h

 # vim backup files
--- a/tests/xbps/libxbps/shell/Kyuafile
+++ b/tests/xbps/libxbps/shell/Kyuafile
@ -17,12 +17,12 @@ atf_test_program{name="vpkg_test"}
 atf_test_program{name="install_test"}
 atf_test_program{name="configure_test"}
 atf_test_program{name="preserve_files_test"}
-atf_test_program{name="update_shlibs"}
-atf_test_program{name="update_hold"}
-atf_test_program{name="update_repolock"}
-atf_test_program{name="update_itself"}
-atf_test_program{name="cyclic_deps"}
-atf_test_program{name="conflicts"}
-atf_test_program{name="downgrade_hold"}
-atf_test_program{name="ignore"}
-atf_test_program{name="preserve"}
+atf_test_program{name="update_shlibs_test"}
+atf_test_program{name="update_hold_test"}
+atf_test_program{name="update_repolock_test"}
+atf_test_program{name="update_itself_test"}
+atf_test_program{name="cyclic_deps_test"}
+atf_test_program{name="conflicts_test"}
+atf_test_program{name="downgrade_hold_test"}
+atf_test_program{name="ignore_test"}
+atf_test_program{name="preserve_test"}
--- a/tests/xbps/libxbps/shell/Makefile
+++ b/tests/xbps/libxbps/shell/Makefile
@ -6,8 +6,9 @@ TESTSHELL = conf_files_test issue6_test issue18_test issue20_test remove_test
 TESTSHELL+= replace_test installmode_test obsoletefiles_test
 TESTSHELL+= issue31_test scripts_test incorrect_deps_test
 TESTSHELL+= vpkg_test install_test preserve_files_test configure_test
-TESTSHELL+= update_shlibs update_hold update_repolock cyclic_deps conflicts
-TESTSHELL+= update_itself downgrade_hold ignore preserve
+TESTSHELL+= update_shlibs_test update_hold_test update_repolock_test
+TESTSHELL+= cyclic_deps_test conflicts_test update_itself_test
+TESTSHELL+= downgrade_hold_test ignore_test preserve_test
 EXTRA_FILES = Kyuafile

 include $(TOPDIR)/mk/test.mk
--- a/tests/xbps/libxbps/shell/conflicts_test.sh
+++ b/tests/xbps/libxbps/shell/conflicts_test.sh
--- a/tests/xbps/libxbps/shell/cyclic_deps_test.sh
+++ b/tests/xbps/libxbps/shell/cyclic_deps_test.sh
--- a/tests/xbps/libxbps/shell/downgrade_hold_test.sh
+++ b/tests/xbps/libxbps/shell/downgrade_hold_test.sh
--- a/tests/xbps/libxbps/shell/ignore_test.sh
+++ b/tests/xbps/libxbps/shell/ignore_test.sh
--- a/tests/xbps/libxbps/shell/preserve_test.sh
+++ b/tests/xbps/libxbps/shell/preserve_test.sh
--- a/tests/xbps/libxbps/shell/update_hold_test.sh
+++ b/tests/xbps/libxbps/shell/update_hold_test.sh
--- a/tests/xbps/libxbps/shell/update_itself_test.sh
+++ b/tests/xbps/libxbps/shell/update_itself_test.sh
--- a/tests/xbps/libxbps/shell/update_repolock_test.sh
+++ b/tests/xbps/libxbps/shell/update_repolock_test.sh
--- a/tests/xbps/libxbps/shell/update_shlibs_test.sh
+++ b/tests/xbps/libxbps/shell/update_shlibs_test.sh
--- a/tests/xbps/xbps-alternatives/Kyuafile
+++ b/tests/xbps/xbps-alternatives/Kyuafile
@ -1,4 +1,4 @@
 syntax("kyuafile", 1)

 test_suite("xbps-alternatives")
-atf_test_program{name="main"}
+atf_test_program{name="main_test"}
--- a/tests/xbps/xbps-alternatives/Makefile
+++ b/tests/xbps/xbps-alternatives/Makefile
@ -1,7 +1,7 @@
 TOPDIR = ../../..
 -include $(TOPDIR)/config.mk

-TESTSHELL = main
+TESTSHELL = main_test
 TESTSSUBDIR = xbps/xbps-alternatives
 EXTRA_FILES = Kyuafile

--- a/tests/xbps/xbps-alternatives/main_test.sh
+++ b/tests/xbps/xbps-alternatives/main_test.sh
--- a/tests/xbps/xbps-checkvers/Kyuafile
+++ b/tests/xbps/xbps-checkvers/Kyuafile
@ -1,4 +1,4 @@
 syntax("kyuafile", 1)

 test_suite("xbps-checkvers")
-atf_test_program{name="checkvers"}
+atf_test_program{name="checkvers_test"}
--- a/tests/xbps/xbps-checkvers/Makefile
+++ b/tests/xbps/xbps-checkvers/Makefile
@ -1,7 +1,7 @@
 TOPDIR = ../../..
 -include $(TOPDIR)/config.mk

-TESTSHELL = checkvers
+TESTSHELL = checkvers_test
 TESTSSUBDIR = xbps/xbps-checkvers
 EXTRA_FILES = Kyuafile

--- a/tests/xbps/xbps-checkvers/checkvers_test.sh
+++ b/tests/xbps/xbps-checkvers/checkvers_test.sh