* [LTP] [PATCH v7 1/7] lib: Print Summary: into stderr
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-03 9:30 ` Cyril Hrubis
2021-08-02 17:35 ` [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system Petr Vorel
` (5 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
to follow tst_{brk,res}() being printed to stderr.
Found with GitHub actions where stdout and stderr are probably
block buffered and flushed at different times.
Suggested-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
The same as in v6.
lib/tst_test.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/tst_test.c b/lib/tst_test.c
index c7c77596c..d15c8c054 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -734,12 +734,12 @@ static void do_exit(int ret)
if (results->broken)
ret |= TBROK;
- printf("\nSummary:\n");
- printf("passed %d\n", results->passed);
- printf("failed %d\n", results->failed);
- printf("broken %d\n", results->broken);
- printf("skipped %d\n", results->skipped);
- printf("warnings %d\n", results->warnings);
+ fprintf(stderr, "\nSummary:\n");
+ fprintf(stderr, "passed %d\n", results->passed);
+ fprintf(stderr, "failed %d\n", results->failed);
+ fprintf(stderr, "broken %d\n", results->broken);
+ fprintf(stderr, "skipped %d\n", results->skipped);
+ fprintf(stderr, "warnings %d\n", results->warnings);
}
do_cleanup();
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 1/7] lib: Print Summary: into stderr
2021-08-02 17:35 ` [LTP] [PATCH v7 1/7] lib: Print Summary: into stderr Petr Vorel
@ 2021-08-03 9:30 ` Cyril Hrubis
2021-08-03 11:35 ` Petr Vorel
0 siblings, 1 reply; 17+ messages in thread
From: Cyril Hrubis @ 2021-08-03 9:30 UTC (permalink / raw)
To: ltp
Hi!
I wonder if this change can break anything but I guess that it's
unlikely.
Also while you are at it can you also fix tags? We do print help() to
stderr but tags that follow go into stdout which is rather starnge.
And the failure hints are written to stdout as well, which should be
fixed as well.
> Suggested-by: Cyril Hrubis <chrubis@suse.cz>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> The same as in v6.
>
> lib/tst_test.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/lib/tst_test.c b/lib/tst_test.c
> index c7c77596c..d15c8c054 100644
> --- a/lib/tst_test.c
> +++ b/lib/tst_test.c
> @@ -734,12 +734,12 @@ static void do_exit(int ret)
> if (results->broken)
> ret |= TBROK;
>
> - printf("\nSummary:\n");
> - printf("passed %d\n", results->passed);
> - printf("failed %d\n", results->failed);
> - printf("broken %d\n", results->broken);
> - printf("skipped %d\n", results->skipped);
> - printf("warnings %d\n", results->warnings);
> + fprintf(stderr, "\nSummary:\n");
> + fprintf(stderr, "passed %d\n", results->passed);
> + fprintf(stderr, "failed %d\n", results->failed);
> + fprintf(stderr, "broken %d\n", results->broken);
> + fprintf(stderr, "skipped %d\n", results->skipped);
> + fprintf(stderr, "warnings %d\n", results->warnings);
> }
>
> do_cleanup();
> --
> 2.32.0
>
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 1/7] lib: Print Summary: into stderr
2021-08-03 9:30 ` Cyril Hrubis
@ 2021-08-03 11:35 ` Petr Vorel
0 siblings, 0 replies; 17+ messages in thread
From: Petr Vorel @ 2021-08-03 11:35 UTC (permalink / raw)
To: ltp
Hi Cyril,
> Hi!
> I wonder if this change can break anything but I guess that it's
> unlikely.
> Also while you are at it can you also fix tags? We do print help() to
> stderr but tags that follow go into stdout which is rather starnge.
> And the failure hints are written to stdout as well, which should be
> fixed as well.
Sure, I'll fix them all in v8.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 17+ messages in thread
* [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
2021-08-02 17:35 ` [LTP] [PATCH v7 1/7] lib: Print Summary: into stderr Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-03 9:25 ` Cyril Hrubis
2021-08-02 17:35 ` [LTP] [PATCH v7 3/7] lib: Add script for running tests Petr Vorel
` (4 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
On GitHub Actions /proc/sys/vm/nr_hugepages is not allowed to be
changed:
./test_zero_hugepage.sh: line 9: can't create /proc/sys/vm/nr_hugepages: Read-only file system
tst_hugepage.c:57: TBROK: Failed to open FILE '/proc/sys/vm/nr_hugepages' for writing: EROFS (30)
tst_sys_conf.c:102: TWARN: Failed to open FILE '/proc/sys/vm/nr_hugepages'
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
New in v7.
lib/newlib_tests/test_zero_hugepage.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/newlib_tests/test_zero_hugepage.sh b/lib/newlib_tests/test_zero_hugepage.sh
index 10113006b..8a462478e 100755
--- a/lib/newlib_tests/test_zero_hugepage.sh
+++ b/lib/newlib_tests/test_zero_hugepage.sh
@@ -1,12 +1,16 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (c) 2021 Yang Xu <xuyang2018.jy@fujitsu.com>
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
echo "Testing .request_hugepages = TST_NO_HUGEPAGES"
orig_value=`cat /proc/sys/vm/nr_hugepages`
-echo "128" > /proc/sys/vm/nr_hugepages
+if ! echo "128" > /proc/sys/vm/nr_hugepages; then
+ echo "TCONF: failed to open /proc/sys/vm/nr_hugepages"
+ exit 32
+fi
./test_zero_hugepage
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system
2021-08-02 17:35 ` [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system Petr Vorel
@ 2021-08-03 9:25 ` Cyril Hrubis
2021-08-03 11:34 ` Petr Vorel
0 siblings, 1 reply; 17+ messages in thread
From: Cyril Hrubis @ 2021-08-03 9:25 UTC (permalink / raw)
To: ltp
Hi!
> On GitHub Actions /proc/sys/vm/nr_hugepages is not allowed to be
> changed:
>
> ./test_zero_hugepage.sh: line 9: can't create /proc/sys/vm/nr_hugepages: Read-only file system
> tst_hugepage.c:57: TBROK: Failed to open FILE '/proc/sys/vm/nr_hugepages' for writing: EROFS (30)
> tst_sys_conf.c:102: TWARN: Failed to open FILE '/proc/sys/vm/nr_hugepages'
Hmm, it's rather strange to have proc mounted RO but I guess that we
can't do much about it. I guess that it wouldn't allow us to remount it
RW, so there is not much we can do about it.
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> New in v7.
>
> lib/newlib_tests/test_zero_hugepage.sh | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/lib/newlib_tests/test_zero_hugepage.sh b/lib/newlib_tests/test_zero_hugepage.sh
> index 10113006b..8a462478e 100755
> --- a/lib/newlib_tests/test_zero_hugepage.sh
> +++ b/lib/newlib_tests/test_zero_hugepage.sh
> @@ -1,12 +1,16 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0-or-later
> # Copyright (c) 2021 Yang Xu <xuyang2018.jy@fujitsu.com>
> +# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
>
> echo "Testing .request_hugepages = TST_NO_HUGEPAGES"
>
> orig_value=`cat /proc/sys/vm/nr_hugepages`
>
> -echo "128" > /proc/sys/vm/nr_hugepages
> +if ! echo "128" > /proc/sys/vm/nr_hugepages; then
> + echo "TCONF: failed to open /proc/sys/vm/nr_hugepages"
> + exit 32
> +fi
I wonder if we should rather check if proc is mounted readonly
explicitly since this may hide all kinds of errors.
> ./test_zero_hugepage
>
> --
> 2.32.0
>
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 17+ messages in thread
* [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system
2021-08-03 9:25 ` Cyril Hrubis
@ 2021-08-03 11:34 ` Petr Vorel
2021-08-03 11:37 ` Cyril Hrubis
0 siblings, 1 reply; 17+ messages in thread
From: Petr Vorel @ 2021-08-03 11:34 UTC (permalink / raw)
To: ltp
Hi Cyril,
...
> I wonder if we should rather check if proc is mounted readonly
> explicitly since this may hide all kinds of errors.
Sure, makes sense, I'll adapt it in v8. It's just not a fun to write tests which
you cannot debug on VM, but just pushing to git :(.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 17+ messages in thread
* [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system
2021-08-03 11:34 ` Petr Vorel
@ 2021-08-03 11:37 ` Cyril Hrubis
2021-08-03 16:46 ` Petr Vorel
0 siblings, 1 reply; 17+ messages in thread
From: Cyril Hrubis @ 2021-08-03 11:37 UTC (permalink / raw)
To: ltp
Hi!
> > I wonder if we should rather check if proc is mounted readonly
> > explicitly since this may hide all kinds of errors.
> Sure, makes sense, I'll adapt it in v8. It's just not a fun to write tests which
> you cannot debug on VM, but just pushing to git :(.
Well I guess that you can remount proc RO on your testing machine with
something as:
mount -o remount,ro /proc
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 17+ messages in thread
* [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system
2021-08-03 11:37 ` Cyril Hrubis
@ 2021-08-03 16:46 ` Petr Vorel
0 siblings, 0 replies; 17+ messages in thread
From: Petr Vorel @ 2021-08-03 16:46 UTC (permalink / raw)
To: ltp
> Hi!
> > > I wonder if we should rather check if proc is mounted readonly
> > > explicitly since this may hide all kinds of errors.
> > Sure, makes sense, I'll adapt it in v8. It's just not a fun to write tests which
> > you cannot debug on VM, but just pushing to git :(.
> Well I guess that you can remount proc RO on your testing machine with
> something as:
> mount -o remount,ro /proc
Indeed one (very old one) of many of my VMs didn't yell "mount: /proc: mount
point is busy." and actually allowed remount /proc to ro. Nice, thanks for a
tip!
Kind regards,
Petr
^ permalink raw reply [flat|nested] 17+ messages in thread
* [LTP] [PATCH v7 3/7] lib: Add script for running tests
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
2021-08-02 17:35 ` [LTP] [PATCH v7 1/7] lib: Print Summary: into stderr Petr Vorel
2021-08-02 17:35 ` [LTP] [PATCH v7 2/7] test/test_zero_hugepage.sh: Skip test on read-only file system Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-03 10:05 ` Cyril Hrubis
2021-08-02 17:35 ` [LTP] [PATCH v7 4/7] make: Add make test{, -c, -shell} targets Petr Vorel
` (3 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
For now run only tests which TPASS or TCONF.
tst_fuzzy_sync01: sporadically fails, thus disabled:
../../include/tst_fuzzy_sync.h:685: TINFO: Exceeded execution loops, requesting exit
tst_fuzzy_sync01.c:227: TFAIL: acs:3 act:1 art:1 | =:23 -:46 +:2999931
...
Summary:
passed 21
failed 3
Redirect stderr to stdout to workaround mangled output on GitHub Actions
where stdout and stderr are probably block buffered and flushed at
different times.
NOTE: test_zero_hugepage.sh is testing C API, thus added in
LTP_C_API_TESTS. Using shell tests also in C API tests i.e.
test_zero_hugepage.sh (helpers to setup environment tests) requires
to search file also in src directory (required for out-of-tree builds).
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Changes v6->v7:
* have look on source directory, because we use scripts for running C
API (test_zero_hugepage.sh), required for out-of-tree
lib/newlib_tests/runtest.sh | 190 ++++++++++++++++++++++++++++++++++++
1 file changed, 190 insertions(+)
create mode 100755 lib/newlib_tests/runtest.sh
diff --git a/lib/newlib_tests/runtest.sh b/lib/newlib_tests/runtest.sh
new file mode 100755
index 000000000..70fbffb6c
--- /dev/null
+++ b/lib/newlib_tests/runtest.sh
@@ -0,0 +1,190 @@
+#!/bin/sh
+# Copyright (c) 2021 Petr Vorel <pvorel@suse.cz>
+
+LTP_C_API_TESTS="${LTP_C_API_TESTS:-test05 test07 test09 test12 test15 test18
+tst_bool_expr test_exec test_timer tst_res_hexd tst_strstatus tst_fuzzy_sync02
+tst_fuzzy_sync03 test_zero_hugepage.sh}"
+
+LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh shell/net/*.sh}"
+
+cd $(dirname $0)
+PATH="$PWD/../../testcases/lib/:$PATH"
+
+. tst_ansi_color.sh
+
+usage()
+{
+ cat << EOF
+Usage: $0 [-b DIR ] [-c|-s]
+-b DIR build directory (required for out-of-tree build)
+-c run C API tests only
+-s run shell API tests only
+-h print this help
+EOF
+}
+
+tst_flag2mask()
+{
+ case "$1" in
+ TPASS) return 0;;
+ TFAIL) return 1;;
+ TBROK) return 2;;
+ TWARN) return 4;;
+ TINFO) return 16;;
+ TCONF) return 32;;
+ esac
+}
+
+runtest_res()
+{
+ if [ $# -eq 0 ]; then
+ echo >&2
+ return
+ fi
+
+ local res="$1"
+ shift
+
+ tst_color_enabled
+ local color=$?
+
+ printf "runtest " >&2
+ tst_print_colored $res "$res: " >&2
+ echo "$@" >&2
+
+}
+
+runtest_brk()
+{
+ local res="$1"
+ shift
+
+ tst_flag2mask "$res"
+ local mask=$?
+
+ runtest_res
+ runtest_res $res $@
+
+ exit $mask
+}
+
+run_tests()
+{
+ local target="$1"
+ local srcdir="$2"
+ local dir i res ret=0 tbrok tconf tfail tpass twarn vars
+
+ eval vars="\$LTP_${target}_API_TESTS"
+
+ runtest_res TINFO "=== Run $target tests ==="
+
+ for i in $vars; do
+ runtest_res TINFO "* $i"
+ if [ -f "$i" ]; then
+ dir="."
+ elif [ "$srcdir" -a -f "$srcdir/$i" ]; then
+ dir="$srcdir"
+ else
+ runtest_brk TBROK "Error: $i file not found (PWD: $PWD)"
+ fi
+
+ $dir/$i 1>&2
+ res=$?
+
+ [ $res -ne 0 -a $res -ne 32 ] && ret=1
+
+ case $res in
+ 0) tpass="$tpass $i";;
+ 1) tfail="$tfail $i";;
+ 2) tbrok="$tbrok $i";;
+ 4) twarn="$twarn $i";;
+ 32) tconf="$tconf $i";;
+ 127) runtest_brk TBROK "Error: file not found (wrong PATH? out-of-tree build without -b?), exit code: $res";;
+ *) runtest_brk TBROK "Error: unknown failure, exit code: $res";;
+ esac
+ runtest_res
+ done
+
+ runtest_res TINFO "=== $target TEST RESULTS ==="
+ runtest_res TINFO "$(echo $tpass | wc -w)x TPASS:$tpass"
+ runtest_res TINFO "$(echo $tfail | wc -w)x TFAIL:$tfail"
+ runtest_res TINFO "$(echo $tbrok | wc -w)x TBROK:$tbrok"
+ runtest_res TINFO "$(echo $twarn | wc -w)x TWARN:$twarn"
+ runtest_res TINFO "$(echo $tconf | wc -w)x TCONF:$tconf"
+ runtest_res
+
+ return $ret
+}
+
+run_c_tests()
+{
+ local ret srcdir="$PWD"
+
+ if [ "$builddir" ]; then
+ cd $builddir/lib/newlib_tests
+ fi
+
+ run_tests "C" "$srcdir"
+ ret=$?
+
+ if [ "$builddir" ]; then
+ cd "$srcdir"
+ fi
+
+ return $ret
+}
+
+run_shell_tests()
+{
+ run_tests "SHELL"
+}
+
+
+print_result()
+{
+ local target="$1"
+ local res="$2"
+
+
+ if [ -z "$res" ]; then
+ runtest_res TCONF "$target tests skipped"
+ elif [ $res -eq 0 ]; then
+ runtest_res TPASS "All $target tests TCONF/TPASS"
+ else
+ runtest_res TFAIL "Some $target test(s) TBROK/TFAIL/TWARN"
+ fi
+}
+
+builddir=
+c_fail=
+run=
+shell_fail=
+
+while getopts b:chs opt; do
+ case $opt in
+ 'h') usage; exit 0;;
+ 'b') builddir=$OPTARG; PATH="$builddir/testcases/lib:$PATH";;
+ 'c') run="c";;
+ 's') run="s";;
+ *) usage; runtest_brk TBROK "Error: invalid option";;
+ esac
+done
+
+runtest_res TINFO "PATH='$PATH'"
+
+if [ -z "$run" -o "$run" = "c" ]; then
+ run_c_tests
+ c_fail=$?
+fi
+
+if [ -z "$run" -o "$run" = "s" ]; then
+ run_shell_tests
+ shell_fail=$?
+fi
+
+runtest_res TINFO "=== FINAL TEST RESULTS ==="
+
+print_result "C" "$c_fail"
+print_result "shell" "$shell_fail"
+
+exit $((c_fail|shell_fail))
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 4/7] make: Add make test{, -c, -shell} targets
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
` (2 preceding siblings ...)
2021-08-02 17:35 ` [LTP] [PATCH v7 3/7] lib: Add script for running tests Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-02 17:35 ` [LTP] [PATCH v7 5/7] build.sh: Add support for make test{, -c, -shell} Petr Vorel
` (2 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
For testing C and shell API.
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
The same as in v6.
Makefile | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/Makefile b/Makefile
index 3b0ba330d..4e37362f9 100644
--- a/Makefile
+++ b/Makefile
@@ -200,6 +200,29 @@ check: $(CHECK_TARGETS)
## Install
install: $(INSTALL_TARGETS)
+## Test
+define _test
+ @set -e; $(top_srcdir)/lib/newlib_tests/runtest.sh -b $(abs_builddir) $(1)
+endef
+
+test: lib-all
+ifneq ($(build),$(host))
+ $(error running tests on cross-compile build not supported)
+endif
+ $(call _test)
+
+test-c: lib-all
+ifneq ($(build),$(host))
+ $(error running tests on cross-compile build not supported)
+endif
+ $(call _test,-c)
+
+test-shell: lib-all
+ifneq ($(build),$(host))
+ $(error running tests on cross-compile build not supported)
+endif
+ $(call _test,-s)
+
## Help
.PHONY: help
help:
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 5/7] build.sh: Add support for make test{, -c, -shell}
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
` (3 preceding siblings ...)
2021-08-02 17:35 ` [LTP] [PATCH v7 4/7] make: Add make test{, -c, -shell} targets Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-02 17:35 ` [LTP] [PATCH v7 6/7] CI: Run also make test-c, test-shell Petr Vorel
2021-08-02 17:35 ` [LTP] [PATCH v7 7/7] ci: Install iproute2 Petr Vorel
6 siblings, 0 replies; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
The same as in v6.
build.sh | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 240ce8e68..1767cc21b 100755
--- a/build.sh
+++ b/build.sh
@@ -119,6 +119,17 @@ build_out_tree()
make $MAKE_OPTS_OUT_TREE
}
+test_in_tree()
+{
+ make $1
+}
+
+test_out_tree()
+{
+ cd $BUILD_DIR
+ make $MAKE_OPTS_OUT_TREE $1
+}
+
install_in_tree()
{
make $MAKE_OPTS install
@@ -165,6 +176,9 @@ RUN:
autotools run only 'make autotools'
configure run only 'configure'
build run only 'make'
+test run only 'make test' (not supported for cross-compile build)
+test-c run only 'make test-c' (not supported for cross-compile build)
+test-shell run only 'make test-shell' (not supported for cross-compile build)
install run only 'make install'
Default configure options:
@@ -192,7 +206,7 @@ while getopts "c:hio:p:r:t:" opt; do
esac;;
p) prefix="$OPTARG";;
r) case "$OPTARG" in
- autotools|configure|build|install) run="$OPTARG";;
+ autotools|configure|build|test|test-c|test-shell|install) run="$OPTARG";;
*) echo "Wrong run type '$OPTARG'" >&2; usage; exit 1;;
esac;;
t) case "$OPTARG" in
@@ -218,6 +232,14 @@ if [ -z "$run" -o "$run" = "build" ]; then
eval build_${tree}_tree
fi
+if [ -z "$run" -o "$run" = "test" -o "$run" = "test-c" -o "$run" = "test-shell" ]; then
+ if [ "$build" = "cross" ]; then
+ echo "cross-compile build, skipping running tests" >&2
+ else
+ eval test_${tree}_tree $run
+ fi
+fi
+
if [ -z "$run" -o "$run" = "install" ]; then
if [ "$install" = 1 ]; then
eval install_${tree}_tree
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 6/7] CI: Run also make test-c, test-shell
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
` (4 preceding siblings ...)
2021-08-02 17:35 ` [LTP] [PATCH v7 5/7] build.sh: Add support for make test{, -c, -shell} Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-03 11:31 ` Cyril Hrubis
2021-08-02 17:35 ` [LTP] [PATCH v7 7/7] ci: Install iproute2 Petr Vorel
6 siblings, 1 reply; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
run C and shell test separately (test-c and test-shell instead of test).
Having them separate helps to easily navigate in CI.
It's run on all jobs, but on cross compile jobs it's obviously skipped.
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
The same as in v6.
.github/workflows/ci.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f67f14927..9d37f49e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -151,6 +151,16 @@ jobs:
- name: Compile
run: ./build.sh -r build -o ${TREE:-in}
+ - name: Test C API
+ run: |
+ case "$VARIANT" in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
+ ./build.sh -r test-c -o ${TREE:-in} -t $BUILD
+
+ - name: Test shell API
+ run: |
+ case "$VARIANT" in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
+ ./build.sh -r test-shell -o ${TREE:-in} -t $BUILD
+
- name: Install
run: |
if [ "$MAKE_INSTALL" = 1 ]; then INSTALL_OPT="-i"; fi
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [LTP] [PATCH v7 7/7] ci: Install iproute2
2021-08-02 17:35 [LTP] [PATCH v7 0/7] Run tests in CI Petr Vorel
` (5 preceding siblings ...)
2021-08-02 17:35 ` [LTP] [PATCH v7 6/7] CI: Run also make test-c, test-shell Petr Vorel
@ 2021-08-02 17:35 ` Petr Vorel
2021-08-03 11:32 ` Cyril Hrubis
6 siblings, 1 reply; 17+ messages in thread
From: Petr Vorel @ 2021-08-02 17:35 UTC (permalink / raw)
To: ltp
shell API test runtime dependency. To fix:
runtest TINFO: * shell/net/tst_rhost_run.sh
tst_rhost_run 1 TCONF: 'ip' not found
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
New in v7.
ci/debian.sh | 1 +
ci/fedora.sh | 1 +
ci/tumbleweed.sh | 1 +
3 files changed, 3 insertions(+)
diff --git a/ci/debian.sh b/ci/debian.sh
index a609da887..e929452ff 100755
--- a/ci/debian.sh
+++ b/ci/debian.sh
@@ -22,6 +22,7 @@ $apt \
clang \
gcc \
git \
+ iproute2 \
libacl1 \
libacl1-dev \
libaio-dev \
diff --git a/ci/fedora.sh b/ci/fedora.sh
index 959f3af20..dc1293aa5 100755
--- a/ci/fedora.sh
+++ b/ci/fedora.sh
@@ -13,6 +13,7 @@ $yum \
gcc \
git \
findutils \
+ iproute \
numactl-devel \
libtirpc \
libtirpc-devel \
diff --git a/ci/tumbleweed.sh b/ci/tumbleweed.sh
index ab622e05c..f1e7252f2 100755
--- a/ci/tumbleweed.sh
+++ b/ci/tumbleweed.sh
@@ -13,6 +13,7 @@ $zyp \
gcc \
git \
gzip \
+ iproute2 \
make \
kernel-default-devel \
keyutils-devel \
--
2.32.0
^ permalink raw reply related [flat|nested] 17+ messages in thread