From a3209f4b576b3cd63b985e3339b95669d1ffcd7a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 20 Jun 2019 12:50:10 +0200 Subject: [PATCH] tests: rename some tests to make .gitignore effective. --- .gitignore | 2 ++ tests/xbps/libxbps/shell/Kyuafile | 18 +++++++++--------- tests/xbps/libxbps/shell/Makefile | 5 +++-- .../shell/{conflicts.sh => conflicts_test.sh} | 0 .../{cyclic_deps.sh => cyclic_deps_test.sh} | 0 ...owngrade_hold.sh => downgrade_hold_test.sh} | 0 .../shell/{ignore.sh => ignore_test.sh} | 0 .../shell/{preserve.sh => preserve_test.sh} | 0 .../{update_hold.sh => update_hold_test.sh} | 0 ...{update_itself.sh => update_itself_test.sh} | 0 ...ate_repolock.sh => update_repolock_test.sh} | 0 ...{update_shlibs.sh => update_shlibs_test.sh} | 0 tests/xbps/xbps-alternatives/Kyuafile | 2 +- tests/xbps/xbps-alternatives/Makefile | 2 +- .../{main.sh => main_test.sh} | 0 tests/xbps/xbps-checkvers/Kyuafile | 2 +- tests/xbps/xbps-checkvers/Makefile | 2 +- .../{checkvers.sh => checkvers_test.sh} | 0 18 files changed, 18 insertions(+), 15 deletions(-) rename tests/xbps/libxbps/shell/{conflicts.sh => conflicts_test.sh} (100%) rename tests/xbps/libxbps/shell/{cyclic_deps.sh => cyclic_deps_test.sh} (100%) rename tests/xbps/libxbps/shell/{downgrade_hold.sh => downgrade_hold_test.sh} (100%) rename tests/xbps/libxbps/shell/{ignore.sh => ignore_test.sh} (100%) rename tests/xbps/libxbps/shell/{preserve.sh => preserve_test.sh} (100%) rename tests/xbps/libxbps/shell/{update_hold.sh => update_hold_test.sh} (100%) rename tests/xbps/libxbps/shell/{update_itself.sh => update_itself_test.sh} (100%) rename tests/xbps/libxbps/shell/{update_repolock.sh => update_repolock_test.sh} (100%) rename tests/xbps/libxbps/shell/{update_shlibs.sh => update_shlibs_test.sh} (100%) rename tests/xbps/xbps-alternatives/{main.sh => main_test.sh} (100%) rename tests/xbps/xbps-checkvers/{checkvers.sh => checkvers_test.sh} (100%) diff --git a/.gitignore b/.gitignore index db2be9b9..66249eed 100644 --- 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 diff --git a/tests/xbps/libxbps/shell/Kyuafile b/tests/xbps/libxbps/shell/Kyuafile index 6b29b95c..4558b72b 100644 --- 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"} diff --git a/tests/xbps/libxbps/shell/Makefile b/tests/xbps/libxbps/shell/Makefile index d976f7a1..8c7d5df7 100644 --- 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 diff --git a/tests/xbps/libxbps/shell/conflicts.sh b/tests/xbps/libxbps/shell/conflicts_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/conflicts.sh rename to tests/xbps/libxbps/shell/conflicts_test.sh diff --git a/tests/xbps/libxbps/shell/cyclic_deps.sh b/tests/xbps/libxbps/shell/cyclic_deps_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/cyclic_deps.sh rename to tests/xbps/libxbps/shell/cyclic_deps_test.sh diff --git a/tests/xbps/libxbps/shell/downgrade_hold.sh b/tests/xbps/libxbps/shell/downgrade_hold_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/downgrade_hold.sh rename to tests/xbps/libxbps/shell/downgrade_hold_test.sh diff --git a/tests/xbps/libxbps/shell/ignore.sh b/tests/xbps/libxbps/shell/ignore_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/ignore.sh rename to tests/xbps/libxbps/shell/ignore_test.sh diff --git a/tests/xbps/libxbps/shell/preserve.sh b/tests/xbps/libxbps/shell/preserve_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/preserve.sh rename to tests/xbps/libxbps/shell/preserve_test.sh diff --git a/tests/xbps/libxbps/shell/update_hold.sh b/tests/xbps/libxbps/shell/update_hold_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/update_hold.sh rename to tests/xbps/libxbps/shell/update_hold_test.sh diff --git a/tests/xbps/libxbps/shell/update_itself.sh b/tests/xbps/libxbps/shell/update_itself_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/update_itself.sh rename to tests/xbps/libxbps/shell/update_itself_test.sh diff --git a/tests/xbps/libxbps/shell/update_repolock.sh b/tests/xbps/libxbps/shell/update_repolock_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/update_repolock.sh rename to tests/xbps/libxbps/shell/update_repolock_test.sh diff --git a/tests/xbps/libxbps/shell/update_shlibs.sh b/tests/xbps/libxbps/shell/update_shlibs_test.sh similarity index 100% rename from tests/xbps/libxbps/shell/update_shlibs.sh rename to tests/xbps/libxbps/shell/update_shlibs_test.sh diff --git a/tests/xbps/xbps-alternatives/Kyuafile b/tests/xbps/xbps-alternatives/Kyuafile index 1a1d609e..76166c58 100644 --- 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"} diff --git a/tests/xbps/xbps-alternatives/Makefile b/tests/xbps/xbps-alternatives/Makefile index e6da7521..cd2b6737 100644 --- 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 diff --git a/tests/xbps/xbps-alternatives/main.sh b/tests/xbps/xbps-alternatives/main_test.sh similarity index 100% rename from tests/xbps/xbps-alternatives/main.sh rename to tests/xbps/xbps-alternatives/main_test.sh diff --git a/tests/xbps/xbps-checkvers/Kyuafile b/tests/xbps/xbps-checkvers/Kyuafile index 6449ad3f..225b1e9f 100644 --- 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"} diff --git a/tests/xbps/xbps-checkvers/Makefile b/tests/xbps/xbps-checkvers/Makefile index ffcbdf5e..58a00b32 100644 --- 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 diff --git a/tests/xbps/xbps-checkvers/checkvers.sh b/tests/xbps/xbps-checkvers/checkvers_test.sh similarity index 100% rename from tests/xbps/xbps-checkvers/checkvers.sh rename to tests/xbps/xbps-checkvers/checkvers_test.sh