From patchwork Tue Aug 28 11:18:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lanig X-Patchwork-Id: 962843 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.com Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4205rJ0hDgz9s1x for ; Tue, 28 Aug 2018 21:19:44 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 98DC63E71B8 for ; Tue, 28 Aug 2018 13:19:41 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id 86F8E3E6080 for ; Tue, 28 Aug 2018 13:19:35 +0200 (CEST) Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id D6AFD140121D for ; Tue, 28 Aug 2018 13:19:33 +0200 (CEST) Received: from emea4-mta.ukb.novell.com ([10.120.13.87]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Tue, 28 Aug 2018 13:19:32 +0200 Received: from linux-zcnv.suse.de ([10.120.13.202]) by emea4-mta.ukb.novell.com with ESMTP (TLS encrypted); Tue, 28 Aug 2018 12:19:18 +0100 From: Christian Lanig To: ltp@lists.linux.it Date: Tue, 28 Aug 2018 13:18:43 +0200 Message-Id: <20180828111844.20152-1-clanig@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180522193430.20117-2-pvorel@suse.cz> References: <20180522193430.20117-2-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_PASS,WEIRD_QUOTING autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH 1/2] Make shell lib tests standalone X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" --- Please do not merge! See following message for details. lib/newlib_tests/Makefile | 1 - .../{ => shell}/test.TST_TEST.TST_CNT.separate.sh | 2 +- .../{ => shell}/test.TST_TEST.TST_CNT.sh | 2 +- .../{ => shell}/test.TST_TEST.getopts.sh | 2 +- lib/newlib_tests/{ => shell}/test.TST_TEST.sh | 2 +- .../test.TST_TEST_DATA.TST_CNT.separate.sh | 2 +- .../{ => shell}/test.TST_TEST_DATA.TST_CNT.sh | 2 +- .../{ => shell}/test.TST_TEST_DATA.getopts.sh | 2 +- lib/newlib_tests/{ => shell}/test.TST_TEST_DATA.sh | 2 +- .../{ => shell}/test.TST_TEST_DATA_IFS.getopts.sh | 2 +- .../{ => shell}/test.TST_TEST_DATA_IFS.sh | 2 +- lib/newlib_tests/test.shell_lib.sh | 94 ++++++++++++++++++++++ runtest/test | 13 --- testcases/lib/tst_test.sh | 2 +- 14 files changed, 105 insertions(+), 25 deletions(-) rename lib/newlib_tests/{ => shell}/test.TST_TEST.TST_CNT.separate.sh (95%) rename lib/newlib_tests/{ => shell}/test.TST_TEST.TST_CNT.sh (95%) rename lib/newlib_tests/{ => shell}/test.TST_TEST.getopts.sh (96%) rename lib/newlib_tests/{ => shell}/test.TST_TEST.sh (95%) rename lib/newlib_tests/{ => shell}/test.TST_TEST_DATA.TST_CNT.separate.sh (96%) rename lib/newlib_tests/{ => shell}/test.TST_TEST_DATA.TST_CNT.sh (96%) rename lib/newlib_tests/{ => shell}/test.TST_TEST_DATA.getopts.sh (96%) rename lib/newlib_tests/{ => shell}/test.TST_TEST_DATA.sh (95%) rename lib/newlib_tests/{ => shell}/test.TST_TEST_DATA_IFS.getopts.sh (97%) rename lib/newlib_tests/{ => shell}/test.TST_TEST_DATA_IFS.sh (96%) create mode 100755 lib/newlib_tests/test.shell_lib.sh delete mode 100644 runtest/test diff --git a/lib/newlib_tests/Makefile b/lib/newlib_tests/Makefile index ad087b440..2fc50160a 100644 --- a/lib/newlib_tests/Makefile +++ b/lib/newlib_tests/Makefile @@ -16,6 +16,5 @@ ifeq ($(ANDROID),1) FILTER_OUT_MAKE_TARGETS += test08 endif -INSTALL_TARGETS := *.sh include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/lib/newlib_tests/test.TST_TEST.TST_CNT.separate.sh b/lib/newlib_tests/shell/test.TST_TEST.TST_CNT.separate.sh similarity index 95% rename from lib/newlib_tests/test.TST_TEST.TST_CNT.separate.sh rename to lib/newlib_tests/shell/test.TST_TEST.TST_CNT.separate.sh index e26e2cb14..75ab680f1 100755 --- a/lib/newlib_tests/test.TST_TEST.TST_CNT.separate.sh +++ b/lib/newlib_tests/shell/test.TST_TEST.TST_CNT.separate.sh @@ -5,7 +5,7 @@ TST_TESTFUNC=test TST_CNT=2 -. tst_test.sh +. ./tst_test.sh test1() { diff --git a/lib/newlib_tests/test.TST_TEST.TST_CNT.sh b/lib/newlib_tests/shell/test.TST_TEST.TST_CNT.sh similarity index 95% rename from lib/newlib_tests/test.TST_TEST.TST_CNT.sh rename to lib/newlib_tests/shell/test.TST_TEST.TST_CNT.sh index d84457fea..31b15204f 100755 --- a/lib/newlib_tests/test.TST_TEST.TST_CNT.sh +++ b/lib/newlib_tests/shell/test.TST_TEST.TST_CNT.sh @@ -5,7 +5,7 @@ TST_TESTFUNC=do_test TST_CNT=2 -. tst_test.sh +. ./tst_test.sh do_test() { diff --git a/lib/newlib_tests/test.TST_TEST.getopts.sh b/lib/newlib_tests/shell/test.TST_TEST.getopts.sh similarity index 96% rename from lib/newlib_tests/test.TST_TEST.getopts.sh rename to lib/newlib_tests/shell/test.TST_TEST.getopts.sh index 0ba848a0a..090133756 100755 --- a/lib/newlib_tests/test.TST_TEST.getopts.sh +++ b/lib/newlib_tests/shell/test.TST_TEST.getopts.sh @@ -8,7 +8,7 @@ TST_USAGE=usage TST_PARSE_ARGS=parse_args TST_TESTFUNC=do_test -. tst_test.sh +. ./tst_test.sh ALTERNATIVE=0 MODE="foo" diff --git a/lib/newlib_tests/test.TST_TEST.sh b/lib/newlib_tests/shell/test.TST_TEST.sh similarity index 95% rename from lib/newlib_tests/test.TST_TEST.sh rename to lib/newlib_tests/shell/test.TST_TEST.sh index 6ecae710d..42f14151b 100755 --- a/lib/newlib_tests/test.TST_TEST.sh +++ b/lib/newlib_tests/shell/test.TST_TEST.sh @@ -4,7 +4,7 @@ # TST_TESTFUNC=do_test -. tst_test.sh +. ./tst_test.sh do_test() { diff --git a/lib/newlib_tests/test.TST_TEST_DATA.TST_CNT.separate.sh b/lib/newlib_tests/shell/test.TST_TEST_DATA.TST_CNT.separate.sh similarity index 96% rename from lib/newlib_tests/test.TST_TEST_DATA.TST_CNT.separate.sh rename to lib/newlib_tests/shell/test.TST_TEST_DATA.TST_CNT.separate.sh index 9a81ad27c..6d4a90141 100755 --- a/lib/newlib_tests/test.TST_TEST_DATA.TST_CNT.separate.sh +++ b/lib/newlib_tests/shell/test.TST_TEST_DATA.TST_CNT.separate.sh @@ -6,7 +6,7 @@ TST_TESTFUNC=test TST_CNT=2 TST_TEST_DATA="foo:bar:d dd" -. tst_test.sh +. ./tst_test.sh test1() { diff --git a/lib/newlib_tests/test.TST_TEST_DATA.TST_CNT.sh b/lib/newlib_tests/shell/test.TST_TEST_DATA.TST_CNT.sh similarity index 96% rename from lib/newlib_tests/test.TST_TEST_DATA.TST_CNT.sh rename to lib/newlib_tests/shell/test.TST_TEST_DATA.TST_CNT.sh index 798ad9621..8dd25acae 100755 --- a/lib/newlib_tests/test.TST_TEST_DATA.TST_CNT.sh +++ b/lib/newlib_tests/shell/test.TST_TEST_DATA.TST_CNT.sh @@ -6,7 +6,7 @@ TST_TESTFUNC=do_test TST_CNT=2 TST_TEST_DATA="foo:bar:d dd" -. tst_test.sh +. ./tst_test.sh do_test() { diff --git a/lib/newlib_tests/test.TST_TEST_DATA.getopts.sh b/lib/newlib_tests/shell/test.TST_TEST_DATA.getopts.sh similarity index 96% rename from lib/newlib_tests/test.TST_TEST_DATA.getopts.sh rename to lib/newlib_tests/shell/test.TST_TEST_DATA.getopts.sh index 1cd150618..66e534ae5 100755 --- a/lib/newlib_tests/test.TST_TEST_DATA.getopts.sh +++ b/lib/newlib_tests/shell/test.TST_TEST_DATA.getopts.sh @@ -9,7 +9,7 @@ TST_PARSE_ARGS=parse_args TST_TESTFUNC=do_test TST_TEST_DATA="foo0:bar:d dd" -. tst_test.sh +. ./tst_test.sh ALTERNATIVE=0 MODE="foo" diff --git a/lib/newlib_tests/test.TST_TEST_DATA.sh b/lib/newlib_tests/shell/test.TST_TEST_DATA.sh similarity index 95% rename from lib/newlib_tests/test.TST_TEST_DATA.sh rename to lib/newlib_tests/shell/test.TST_TEST_DATA.sh index 4cb51c669..568cec01e 100755 --- a/lib/newlib_tests/test.TST_TEST_DATA.sh +++ b/lib/newlib_tests/shell/test.TST_TEST_DATA.sh @@ -5,7 +5,7 @@ TST_TESTFUNC=do_test TST_TEST_DATA="foo:bar:d dd" -. tst_test.sh +. ./tst_test.sh do_test() { diff --git a/lib/newlib_tests/test.TST_TEST_DATA_IFS.getopts.sh b/lib/newlib_tests/shell/test.TST_TEST_DATA_IFS.getopts.sh similarity index 97% rename from lib/newlib_tests/test.TST_TEST_DATA_IFS.getopts.sh rename to lib/newlib_tests/shell/test.TST_TEST_DATA_IFS.getopts.sh index 59dbd9598..41e3f99de 100755 --- a/lib/newlib_tests/test.TST_TEST_DATA_IFS.getopts.sh +++ b/lib/newlib_tests/shell/test.TST_TEST_DATA_IFS.getopts.sh @@ -10,7 +10,7 @@ TST_TESTFUNC=do_test TST_TEST_DATA="foo0:bar:d dd" TST_TEST_DATA_IFS=":" -. tst_test.sh +. ./tst_test.sh ALTERNATIVE=0 MODE="foo" diff --git a/lib/newlib_tests/test.TST_TEST_DATA_IFS.sh b/lib/newlib_tests/shell/test.TST_TEST_DATA_IFS.sh similarity index 96% rename from lib/newlib_tests/test.TST_TEST_DATA_IFS.sh rename to lib/newlib_tests/shell/test.TST_TEST_DATA_IFS.sh index 52a2e6d47..4e73f5030 100755 --- a/lib/newlib_tests/test.TST_TEST_DATA_IFS.sh +++ b/lib/newlib_tests/shell/test.TST_TEST_DATA_IFS.sh @@ -7,7 +7,7 @@ TST_TESTFUNC=do_test TST_TEST_DATA="foo:bar:d dd" TST_TEST_DATA_IFS=":" -. tst_test.sh +. ./tst_test.sh do_test() { diff --git a/lib/newlib_tests/test.shell_lib.sh b/lib/newlib_tests/test.shell_lib.sh new file mode 100755 index 000000000..599eec78a --- /dev/null +++ b/lib/newlib_tests/test.shell_lib.sh @@ -0,0 +1,94 @@ +# !/bin/sh +# +# This script iterates over all test cases for the new shell lib and verifies +# the output. +# Do NOT use newline symbols in the names of files containing test cases! +# + +setup() { + color_green="\033[1;32m" + color_red="\033[1;31m" + standard_color="\033[0m" + start_dir="$PWD" + cd "$(dirname "$0")""/../../" || exit 1; + sh_lib_dir=""$PWD"/testcases/lib/" + sh_lib_test_dir=""$PWD"/lib/newlib_tests/shell/" + tst_cases=$(ls "$sh_lib_test_dir" | \ + sed "s/"$TEST_NAME".sh/"$TEST_NAME"/g") + cd "$sh_lib_dir" || exit 1 +} + +check_requirements() { + case "$0" in + -*) + printf "Please execute this script. Sourcing "; + printf "(.