From 2b786e0113c105e2434d4e9069797321628b4ab3 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 23 Aug 2017 18:38:26 +0000
Subject: [PATCH] tests: really skip mips o32 scno tampering tests on mips n64

* tests/is_linux_mips_n64.c: New file.
* tests/Makefile.am (check_PROGRAMS): Add it.
* tests/scno_tampering.sh <$STRACE_ARCH == mips>:
In case of mips o32 abi, skip the test if is_linux_mips_n64 says
that the kernel is mips n64, even if "uname -m" claims it's mips.
---
 tests/Makefile.am         |  1 +
 tests/is_linux_mips_n64.c | 45 +++++++++++++++++++++++++++++++++++++++
 tests/scno_tampering.sh   | 11 ++++++++--
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 tests/is_linux_mips_n64.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 42a66c46..b4ba22a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -104,6 +104,7 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
 	ioctl_loop-v \
 	ioctl_nsfs \
 	ioctl_rtc-v \
+	is_linux_mips_n64 \
 	ksysent \
 	mmsg-silent \
 	mmsg_name-v \
diff --git a/tests/is_linux_mips_n64.c b/tests/is_linux_mips_n64.c
new file mode 100644
index 00000000..843203b3
--- /dev/null
+++ b/tests/is_linux_mips_n64.c
@@ -0,0 +1,45 @@
+/*
+ * Check whether the kernel supports MIPS n64 syscalls.
+ *
+ * Copyright (c) 2017 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tests.h"
+
+#ifdef MIPS
+
+int
+main(void)
+{
+	__asm__(".set noreorder; li $a0, 0; li $v0, 5058; syscall");
+	return 77;
+}
+
+#else
+
+SKIP_MAIN_UNDEFINED("MIPS")
+
+#endif
diff --git a/tests/scno_tampering.sh b/tests/scno_tampering.sh
index 094175e4..282f2f31 100755
--- a/tests/scno_tampering.sh
+++ b/tests/scno_tampering.sh
@@ -51,9 +51,16 @@ case "$STRACE_ARCH" in
 	mips)
 		# Only the native ABI is supported by the kernel properly, see
 		# https://sourceforge.net/p/strace/mailman/message/35587571/
+		msg_prefix="mips $MIPS_ABI scno tampering does not work"
 		uname_m="$(uname -m)"
 		case "$MIPS_ABI:$uname_m" in
-			o32:mips|n64:mips64) ;;
-			*) skip_ "$MIPS_ABI scno tampering does not work on $uname_m yet" ;;
+			n64:mips64) ;;
+			o32:mips)
+				# is it really mips32?
+				if ../is_linux_mips_n64; then
+					skip_ "$msg_prefix on mips n64 yet"
+				fi
+				;;
+			*) skip_ "$msg_prefix on $uname_m yet" ;;
 		esac ;;
 esac
-- 
2.40.0