Revert "Run fedora-flags test on all architectures"

This reverts commit bd66e3d65a.

This test is wrong, because it tests the current version of clang
from rawhide and not from the build being tested.

tests/fedora-flags/runtest.sh

@@ -1,22 +1,20 @@
 #!/bin/bash
 
-set -x
+set -ex pipefail
 
-status=0
+cflags=`rpm -D '%toolchain clang' -E %{build_cflags}`
+cxxflags=`rpm -D '%toolchain clang' -E %{build_cxxflags}`
+ldflags=`rpm -D '%toolchain clang' -E %{build_ldflags}`
 
-# arhmfp not tested due to rhbz#1918924.
-arches="s390x ppc64le x86_64 i386 aarch64"
 
-for arch in $arches; do
+# Test a c program
-	root="fedora-rawhide-$arch"
+clang $cflags -c hello.c -o hello.o
-	mock -r $root --install clang
+clang $cflags -c main.c -o main.o
-	mock -r $root --copyin main.c main.cpp hello.c hello.cpp test-clang.sh .
+clang $ldflags -o hello main.o hello.o
-	if mock -r $root --shell bash test-clang.sh; then
+./hello | grep "Hello World"
-		echo "$arch: PASS"
-	else
-		echo "$arch: FAIL"
-		status=1
-	fi
-done
 
-exit $status
+# Test a cxx program
+clang++ $cxxflags -c hello.cpp -o hello-cpp.o
+clang++ $cxxflags -c main.cpp -o main-cpp.o
+clang++ $ldflags -o hello-cpp main-cpp.o hello-cpp.o
+./hello-cpp | grep "Hello World"

tests/fedora-flags/test-clang.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -ex pipefail
-
-function check_flags {
-    if [ -z "$1" ]; then
-        echo "FAIL: failed to get rpm flags"
-        exit 1
-    fi
-}
-
-cflags=`rpm -D '%toolchain clang' -E %{build_cflags}`
-cxxflags=`rpm -D '%toolchain clang' -E %{build_cxxflags}`
-ldflags=`rpm -D '%toolchain clang' -E %{build_ldflags}`
-
-check_flags "$cflags"
-check_flags "$cxxflags"
-check_flags "$ldflags"
-
-# Test a c program
-clang $cflags -c hello.c -o hello.o
-clang $cflags -c main.c -o main.o
-clang $ldflags -o hello main.o hello.o
-./hello | grep "Hello World"
-
-# Test a cxx program
-clang++ $cxxflags -c hello.cpp -o hello-cpp.o
-clang++ $cxxflags -c main.cpp -o main-cpp.o
-clang++ $ldflags -o hello-cpp main-cpp.o hello-cpp.o
-./hello-cpp | grep "Hello World"

tests/tests.yml

@@ -22,8 +22,6 @@
       - glibc-static
       - gcc
       # Required for fedora-flags:
-      - mock
-      - qemu-user-static
       - annobin
       - redhat-rpm-config
       # Required for clang-format-diff