[LTP] [PATCH v2 0/2] Add kirk & ltx tools

[LTP] [PATCH v2 0/2] Add kirk & ltx tools

[Andrea Cervesato]

From: Andrea Cervesato <andrea.cervesato@suse.com>

Replaced runltp-ng with kirk and added ltx tool for parallel execution.

Andrea Cervesato (2):
  Replace runltp-ng with kirk framework
  Add Linux Test eXecutor inside tools

 .gitmodules          |  9 ++++++---
 tools/kirk           |  1 +
 tools/ltx/.gitignore |  1 +
 tools/ltx/Makefile   | 26 ++++++++++++++++++++++++++
 tools/ltx/ltx-src    |  1 +
 tools/runltp-ng      |  1 -
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 160000 tools/kirk
 create mode 100644 tools/ltx/.gitignore
 create mode 100644 tools/ltx/Makefile
 create mode 160000 tools/ltx/ltx-src
 delete mode 160000 tools/runltp-ng

-- 
2.35.3


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH v2 1/2] Replace runltp-ng with kirk framework

[Andrea Cervesato]

From: Andrea Cervesato <andrea.cervesato@suse.com>

Kirk application is a fork of runltp-ng and it aims to merge multiple
Linux testing frameworks in one tool, providing support for remote
testing via Qemu, SSH, LTX, parallel execution and much more.

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
 .gitmodules     | 6 +++---
 tools/kirk      | 1 +
 tools/runltp-ng | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 160000 tools/kirk
 delete mode 160000 tools/runltp-ng

diff --git a/.gitmodules b/.gitmodules
index d1d558b9e..088023039 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "tools/sparse/sparse-src"]
 	path = tools/sparse/sparse-src
 	url = git://git.kernel.org/pub/scm/devel/sparse/sparse.git
-[submodule "tools/runltp-ng"]
-	path = tools/runltp-ng
-	url = https://github.com/linux-test-project/runltp-ng.git
+[submodule "tools/kirk"]
+	path = tools/kirk
+	url = https://github.com/linux-test-project/kirk.git
diff --git a/tools/kirk b/tools/kirk
new file mode 160000
index 000000000..805c56c2a
--- /dev/null
+++ b/tools/kirk
@@ -0,0 +1 @@
+Subproject commit 805c56c2a69b2e9f24ba13f64eab1bdad5885678
diff --git a/tools/runltp-ng b/tools/runltp-ng
deleted file mode 160000
index e842511ed..000000000
--- a/tools/runltp-ng
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e842511ed2c680e3b2ea6dec790913a41d5ed937
-- 
2.35.3


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH v2 2/2] Add Linux Test eXecutor inside tools

[Andrea Cervesato]

From: Andrea Cervesato <andrea.cervesato@suse.com>

The ltx program runs on the system under test (SUT). It's primary
purpose is to run test executables in parallel and serialise the
results.

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
 .gitmodules          |  3 +++
 tools/ltx/.gitignore |  1 +
 tools/ltx/Makefile   | 26 ++++++++++++++++++++++++++
 tools/ltx/ltx-src    |  1 +
 4 files changed, 31 insertions(+)
 create mode 100644 tools/ltx/.gitignore
 create mode 100644 tools/ltx/Makefile
 create mode 160000 tools/ltx/ltx-src

diff --git a/.gitmodules b/.gitmodules
index 088023039..c9a6eea31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "tools/kirk"]
 	path = tools/kirk
 	url = https://github.com/linux-test-project/kirk.git
+[submodule "tools/ltx/ltx-src"]
+	path = tools/ltx/ltx-src
+	url = https://github.com/linux-test-project/ltx.git
diff --git a/tools/ltx/.gitignore b/tools/ltx/.gitignore
new file mode 100644
index 000000000..0205b4ec7
--- /dev/null
+++ b/tools/ltx/.gitignore
@@ -0,0 +1 @@
+ltx
diff --git a/tools/ltx/Makefile b/tools/ltx/Makefile
new file mode 100644
index 000000000..0fbf7cfd9
--- /dev/null
+++ b/tools/ltx/Makefile
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2023 Cyril Hrubis <chrubis@suse.cz>
+#
+# Install script for Linux Test eXecutor
+
+top_srcdir		?= ../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+BINARY=ltx
+
+MAKE_TARGETS := $(BINARY)
+
+CFLAGS+=-I$(abs_srcdir)/ltx-src/ -I$(abs_srcdir)/ltx-src/msgpack/
+
+$(BINARY): $(wildcard $(abs_srcdir)/ltx-src/*.c $(abs_srcdir)/ltx-src/msgpack/*.c)
+ifdef VERBOSE
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+else
+	@echo CC $@
+	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+endif
+
+INSTALL_DIR := $(prefix)
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/tools/ltx/ltx-src b/tools/ltx/ltx-src
new file mode 160000
index 000000000..d6d150947
--- /dev/null
+++ b/tools/ltx/ltx-src
@@ -0,0 +1 @@
+Subproject commit d6d1509479537f4fdfa9b5adcb67eb6312714999
-- 
2.35.3


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2 1/2] Replace runltp-ng with kirk framework

[Petr Vorel]

Hi Andrea,

> From: Andrea Cervesato <andrea.cervesato@suse.com>

> Kirk application is a fork of runltp-ng and it aims to merge multiple
> Linux testing frameworks in one tool, providing support for remote
> testing via Qemu, SSH, LTX, parallel execution and much more.
Maybe s/fork/successor/ ?

I'd note here, that kirk is based on runltp-ng and deprecating runltp-ng
(just to be obvious that it's not a huge change). Also I'd note there is a
backwards compatibility with runltp-ng.

> Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
> ---
>  .gitmodules     | 6 +++---
>  tools/kirk      | 1 +
>  tools/runltp-ng | 1 -
>  3 files changed, 4 insertions(+), 4 deletions(-)
>  create mode 160000 tools/kirk
>  delete mode 160000 tools/runltp-ng

> diff --git a/.gitmodules b/.gitmodules
> index d1d558b9e..088023039 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -4,6 +4,6 @@
>  [submodule "tools/sparse/sparse-src"]
>  	path = tools/sparse/sparse-src
>  	url = git://git.kernel.org/pub/scm/devel/sparse/sparse.git
> -[submodule "tools/runltp-ng"]
> -	path = tools/runltp-ng
> -	url = https://github.com/linux-test-project/runltp-ng.git
> +[submodule "tools/kirk"]
> +	path = tools/kirk
> +	url = https://github.com/linux-test-project/kirk.git
> diff --git a/tools/kirk b/tools/kirk
> new file mode 160000
> index 000000000..805c56c2a
> --- /dev/null
> +++ b/tools/kirk
> @@ -0,0 +1 @@
> +Subproject commit 805c56c2a69b2e9f24ba13f64eab1bdad5885678
Why not add the master HEAD c7419dd ("Fix qemu login prompt recognition")?

https://github.com/linux-test-project/kirk/commit/c7419dd6f73d90f3f02aa17d30270e895e30c88e

IMHO it'd be better to use it, instead of 805c56c (HEAD~).

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr

> diff --git a/tools/runltp-ng b/tools/runltp-ng
> deleted file mode 160000
> index e842511ed..000000000
> --- a/tools/runltp-ng
> +++ /dev/null
> @@ -1 +0,0 @@
> -Subproject commit e842511ed2c680e3b2ea6dec790913a41d5ed937

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2 2/2] Add Linux Test eXecutor inside tools

[Petr Vorel]

Hi Andrea,

Reviewed-by: Petr Vorel <pvorel@suse.cz>

> From: Andrea Cervesato <andrea.cervesato@suse.com>

> The ltx program runs on the system under test (SUT). It's primary
> purpose is to run test executables in parallel and serialise the
> results.

Maybe note here that it's used by kirk?

...
> --- /dev/null
> +++ b/tools/ltx/ltx-src
> @@ -0,0 +1 @@
> +Subproject commit d6d1509479537f4fdfa9b5adcb67eb6312714999
Uses the current HEAD, good :)

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2 2/2] Add Linux Test eXecutor inside tools

[Petr Vorel]

Hi Andrea,

> Hi Andrea,

> Reviewed-by: Petr Vorel <pvorel@suse.cz>

This is breaking build:

2023-09-15T13:47:12.1128844Z make -C ltx
2023-09-15T13:47:12.1148029Z make[3]: *** No targets specified and no makefile found.  Stop.
2023-09-15T13:47:12.1153175Z make[2]: *** [/__w/ltp/ltp/tools/ltx/Makefile:13: all] Error 2
2023-09-15T13:47:12.1159251Z make[1]: *** [../include/mk/generic_trunk_target.inc:108: all] Error 2
2023-09-15T13:47:12.1163512Z make[1]: Leaving directory '/__w/ltp/ltp/tools'
2023-09-15T13:47:12.1169815Z make: *** [Makefile:94: tools-all] Error 2

Reproduce with simple:
$ cd tools && make -C ltx

The problem is because there is no tools/ltx/Makefile

Why are the sources in tools/ltx/ltx-src instead of tools/ltx anyway?
I guess you used sparse approach, which is not necessary here.
I'm ok with that if it makes things simpler, but please include the required
Makefile.

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2 2/2] Add Linux Test eXecutor inside tools

[Cyril Hrubis]

Hi!
> This is breaking build:
> 
> 2023-09-15T13:47:12.1128844Z make -C ltx
> 2023-09-15T13:47:12.1148029Z make[3]: *** No targets specified and no makefile found.  Stop.
> 2023-09-15T13:47:12.1153175Z make[2]: *** [/__w/ltp/ltp/tools/ltx/Makefile:13: all] Error 2
> 2023-09-15T13:47:12.1159251Z make[1]: *** [../include/mk/generic_trunk_target.inc:108: all] Error 2
> 2023-09-15T13:47:12.1163512Z make[1]: Leaving directory '/__w/ltp/ltp/tools'
> 2023-09-15T13:47:12.1169815Z make: *** [Makefile:94: tools-all] Error 2

I suppose that we need

> Reproduce with simple:
> $ cd tools && make -C ltx
> 
> The problem is because there is no tools/ltx/Makefile

Huh? I did apply the two patches and I do have tools/ltx/Makefile

And actually there is a minor problem there, without the submodules
checked out I get:

CC ltx
gcc: fatal error: no input files
compilation terminated.
make: *** [Makefile:21: ltx] Error 1

So I guess that we need:

diff --git a/tools/ltx/Makefile b/tools/ltx/Makefile
index 0fbf7cfd9..43ed93c6b 100644
--- a/tools/ltx/Makefile
+++ b/tools/ltx/Makefile
@@ -7,6 +7,8 @@ top_srcdir              ?= ../..

 include $(top_srcdir)/include/mk/env_pre.mk

+ifneq ($(wildcard $(abs_srcdir/ltx-src/*)),)
+
 BINARY=ltx

 MAKE_TARGETS := $(BINARY)
@@ -23,4 +25,6 @@ endif

 INSTALL_DIR := $(prefix)

+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk

> Why are the sources in tools/ltx/ltx-src instead of tools/ltx anyway?

Because if there is a directory with the name ltx it horribly confused
Make.

> I guess you used sparse approach, which is not necessary here.

I'm not sure that we can do things simpler, the Makefile in the ltx git
repository does not support out of tree build, so unless we remove that
from LTP this is probably the easiest solution.

> I'm ok with that if it makes things simpler, but please include the required
> Makefile.

It is there.

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2 1/2] Replace runltp-ng with kirk framework

[Cyril Hrubis]

Hi!
> > +Subproject commit 805c56c2a69b2e9f24ba13f64eab1bdad5885678
> Why not add the master HEAD c7419dd ("Fix qemu login prompt recognition")?
> 
> https://github.com/linux-test-project/kirk/commit/c7419dd6f73d90f3f02aa17d30270e895e30c88e
> 
> IMHO it'd be better to use it, instead of 805c56c (HEAD~).

That is a mistake that should be fixed.

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH v2 2/2] Add Linux Test eXecutor inside tools

[Petr Vorel]

> Hi!
> > This is breaking build:

> > 2023-09-15T13:47:12.1128844Z make -C ltx
> > 2023-09-15T13:47:12.1148029Z make[3]: *** No targets specified and no makefile found.  Stop.
> > 2023-09-15T13:47:12.1153175Z make[2]: *** [/__w/ltp/ltp/tools/ltx/Makefile:13: all] Error 2
> > 2023-09-15T13:47:12.1159251Z make[1]: *** [../include/mk/generic_trunk_target.inc:108: all] Error 2
> > 2023-09-15T13:47:12.1163512Z make[1]: Leaving directory '/__w/ltp/ltp/tools'
> > 2023-09-15T13:47:12.1169815Z make: *** [Makefile:94: tools-all] Error 2

> I suppose that we need

> > Reproduce with simple:
> > $ cd tools && make -C ltx

> > The problem is because there is no tools/ltx/Makefile

> Huh? I did apply the two patches and I do have tools/ltx/Makefile

I'm sorry, I was wrong, of course tools/ltx/Makefile is there,
there is another make error.

> And actually there is a minor problem there, without the submodules
> checked out I get:

> CC ltx
> gcc: fatal error: no input files
> compilation terminated.
> make: *** [Makefile:21: ltx] Error 1

> So I guess that we need:

> diff --git a/tools/ltx/Makefile b/tools/ltx/Makefile
> index 0fbf7cfd9..43ed93c6b 100644
> --- a/tools/ltx/Makefile
> +++ b/tools/ltx/Makefile
> @@ -7,6 +7,8 @@ top_srcdir              ?= ../..

>  include $(top_srcdir)/include/mk/env_pre.mk

> +ifneq ($(wildcard $(abs_srcdir/ltx-src/*)),)
> +
>  BINARY=ltx

>  MAKE_TARGETS := $(BINARY)
> @@ -23,4 +25,6 @@ endif

>  INSTALL_DIR := $(prefix)

> +endif
> +
>  include $(top_srcdir)/include/mk/generic_leaf_target.mk

+1

> > Why are the sources in tools/ltx/ltx-src instead of tools/ltx anyway?

> Because if there is a directory with the name ltx it horribly confused
> Make.

Thx for info!

> > I guess you used sparse approach, which is not necessary here.

> I'm not sure that we can do things simpler, the Makefile in the ltx git
> repository does not support out of tree build, so unless we remove that
> from LTP this is probably the easiest solution.

Your solution looks OK to me. I guess we could merge it on Monday.

Kind regards,
Petr

> > I'm ok with that if it makes things simpler, but please include the required
> > Makefile.

> It is there.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp