[PATCH 0/3] setarch: test improvements

[PATCH 0/3] setarch: test improvements

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

As discussed this patch-set tries to fix tests if --uname-2.6 is not
supported and to debug systems where --uname-2.6 even segfaults.

Ruediger Meier (3):
  build-sys: ignore vim .swp files
  setarch: add "exec" message to --verbose
  tests: improve setarch tests regarding --uname-2.6 issues

 .gitignore                  |  1 +
 sys-utils/setarch.c         |  7 ++++--
 tests/expected/misc/setarch | 19 +++++++++++++++-
 tests/ts/misc/setarch       | 54 +++++++++++++++++++++++++++++++++++++--------
 4 files changed, 69 insertions(+), 12 deletions(-)

-- 
1.8.4.5

[PATCH 1/3] build-sys: ignore vim .swp files

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 841111e..064010b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.so
 *.so.*
 *.static
+*.swp
 *.vim
 *.[ao]
 *~
-- 
1.8.4.5

[PATCH 2/3] setarch: add "exec" message to --verbose

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

Also we don't need fflush() in non-verbose case.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 sys-utils/setarch.c         | 7 +++++--
 tests/expected/misc/setarch | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index b5e401c..cf29cf7 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -391,8 +391,11 @@ int main(int argc, char *argv[])
 	if (set_arch(arch, options, 0))
 		err(EXIT_FAILURE, _("failed to set personality to %s"), arch);
 
-	/* flush all output streams before exec */
-	fflush(NULL);
+	if (verbose) {
+		printf(_("Execute command `%s'.\n"), argc ? argv[0] : "/bin/sh");
+		/* flush all output streams before exec */
+		fflush(NULL);
+	}
 
 	if (!argc) {
 		execl("/bin/sh", "-sh", NULL);
diff --git a/tests/expected/misc/setarch b/tests/expected/misc/setarch
index 54208ac..0024930 100644
--- a/tests/expected/misc/setarch
+++ b/tests/expected/misc/setarch
@@ -9,4 +9,5 @@ Switching on WHOLE_SECONDS.
 Switching on STICKY_TIMEOUTS.
 Switching on ADDR_LIMIT_3GB.
 Switching on UNAME26.
+Execute command `echo'.
 success
-- 
1.8.4.5

[PATCH 3/3] tests: improve setarch tests regarding --uname-2.6 issues

[Ruediger Meier]

From: Ruediger Meier <ruediger.meier@ga-group.nl>

* add tests for error handling "unknown arch" and
  "unknown command"
* add test without any options
* handle "kernel too old" error for --uname-2.6, add
  debug output
* test --uname-2.6 whithout any other options
* use echo(1) and true(1) for --uname-2.6

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 tests/expected/misc/setarch | 18 ++++++++++++++-
 tests/ts/misc/setarch       | 54 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/tests/expected/misc/setarch b/tests/expected/misc/setarch
index 0024930..e06a752 100644
--- a/tests/expected/misc/setarch
+++ b/tests/expected/misc/setarch
@@ -1,3 +1,14 @@
+###### unknown arch
+setarch: qubit: Unrecognized architecture
+exit: 1
+###### unknown command
+Execute command `/das/gibs/nicht'.
+setarch: /das/gibs/nicht: No such file or directory
+exit: 1
+###### noop uname -a
+Execute command `uname'.
+uname -a unchanged
+###### almost all options
 Switching on ADDR_NO_RANDOMIZE.
 Switching on FDPIC_FUNCPTRS.
 Switching on MMAP_PAGE_ZERO.
@@ -8,6 +19,11 @@ Switching on SHORT_INODE.
 Switching on WHOLE_SECONDS.
 Switching on STICKY_TIMEOUTS.
 Switching on ADDR_LIMIT_3GB.
-Switching on UNAME26.
 Execute command `echo'.
 success
+###### --uname-2.6 echo
+Switching on UNAME26.
+Execute command `echo'.
+2.6 works or kernel too old
+###### --uname-2.6 true, non-verbose
+2.6 works or kernel too old
diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch
index 9b0e92e..e4d22ae 100755
--- a/tests/ts/misc/setarch
+++ b/tests/ts/misc/setarch
@@ -18,16 +18,52 @@ TS_DESC="setarch"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+ARCH=$(uname -m)
+
 ts_check_test_command "$TS_CMD_SETARCH"
 
-ARCH=$(uname -m)
-case $ARCH in
-	#  setarch --uname-2.6 fails on platforms without VDS
-	*sparc* )
-		ts_skip "unsupported arch"
-		;;
-esac
+echo "###### unknown arch" >>$TS_OUTPUT
+$TS_CMD_SETARCH "qubit" -v echo "success" >>$TS_OUTPUT 2>&1
+echo "exit: $?" >>$TS_OUTPUT
+
+echo "###### unknown command" >>$TS_OUTPUT
+$TS_CMD_SETARCH  $ARCH -v /das/gibs/nicht >>$TS_OUTPUT 2>&1
+echo "exit: $?" >>$TS_OUTPUT
+
+echo "###### noop uname -a" >>$TS_OUTPUT
+uname_a=$(uname -srm)
+$TS_CMD_SETARCH $ARCH -v uname -srm >>$TS_OUTPUT 2>&1
+sed -i "$ s@${uname_a}@uname -a unchanged@" $TS_OUTPUT
+
+echo "###### almost all options" >>$TS_OUTPUT
+$TS_CMD_SETARCH $ARCH -vRFZLXBIST3 echo "success" >>$TS_OUTPUT 2>&1
+
+finmsg="" # for debugging 2.6 issues
+
+echo "###### --uname-2.6 echo" >>$TS_OUTPUT
+$TS_CMD_SETARCH $ARCH -v --uname-2.6 echo "2.6 worked" >>$TS_OUTPUT 2>&1
+if [ $? -eq 0 ]; then
+	expected='^2.6 worked$'
+else
+	# this may happen after execvp
+	expected="^FATAL: kernel too old$"
+	finmsg+=" echo"
+fi
+sed -i "$ s/$expected/2.6 works or kernel too old/" $TS_OUTPUT
+
+echo "###### --uname-2.6 true, non-verbose" >>$TS_OUTPUT
+$TS_CMD_SETARCH $ARCH --uname-2.6 true >>$TS_OUTPUT 2>&1
+if [ $? -eq 0 ]; then
+	echo "2.6 works or kernel too old" >> $TS_OUTPUT
+else
+	# this may happen after execvp
+	expected="^FATAL: kernel too old$"
+	sed -i "$ s/$expected/2.6 works or kernel too old/" $TS_OUTPUT
+	finmsg+=" true"
+fi
 
-$TS_CMD_SETARCH $(uname -m) -vRFZLXBIST3 --uname-2.6 echo "success" >$TS_OUTPUT 2>&1
+if [ -n "$finmsg" ]; then
+	finmsg=$(echo unsupported --uname-2.6: $finmsg)
+fi
 
-ts_finalize
+ts_finalize "$finmsg"
-- 
1.8.4.5

Re: [PATCH 0/3] setarch: test improvements

[Ruediger Meier]

On Tuesday 22 March 2016, Ruediger Meier wrote:
> From: Ruediger Meier <ruediger.meier@ga-group.nl>
>
> As discussed this patch-set tries to fix tests if --uname-2.6 is not
> supported and to debug systems where --uname-2.6 even segfaults.
>
> Ruediger Meier (3):
>   build-sys: ignore vim .swp files
>   setarch: add "exec" message to --verbose
>   tests: improve setarch tests regarding --uname-2.6 issues
>
>  .gitignore                  |  1 +
>  sys-utils/setarch.c         |  7 ++++--
>  tests/expected/misc/setarch | 19 +++++++++++++++-
>  tests/ts/misc/setarch       | 54
> +++++++++++++++++++++++++++++++++++++-------- 4 files changed, 69
> insertions(+), 12 deletions(-)

Please don't merge yet. I've made some cosmetical updates and push it 
later on github after all tests are finished again.