fixup! Rework ktest -> test interface

3 files changed, 159 insertions, 159 deletions

diff --git a/lib/common.sh b/lib/common.sh
index 1318a27..9a70d07 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -47,3 +47,162 @@ join_by()
     shift
     echo "$*"
 }
+
+ktest_arch=$(uname -m)
+CROSS_COMPILE=""
+
+parse_arch()
+{
+    case $1 in
+	x86|i386)
+	    ktest_arch=x86
+	    DEBIAN_ARCH=i386
+	    ARCH_TRIPLE=x86-linux-gnu
+
+	    KERNEL_ARCH=x86
+	    BITS=32
+
+	    QEMU_PACKAGE=qemu-system-x86
+	    QEMU_BIN=qemu-system-x86_64
+	    ;;
+	x86_64|amd64)
+	    ktest_arch=x86_64
+	    DEBIAN_ARCH=amd64
+	    ARCH_TRIPLE=x86_64-linux-gnu
+
+	    KERNEL_ARCH=x86
+	    BITS=64
+
+	    QEMU_PACKAGE=qemu-system-x86
+	    QEMU_BIN=qemu-system-x86_64
+	    ;;
+	mips)
+	    DEBIAN_ARCH=mips
+	    ARCH_TRIPLE=mips-linux-gnu
+
+	    KERNEL_ARCH=mips
+	    BITS=32
+
+	    QEMU_PACKAGE=qemu-system-mips
+	    QEMU_BIN=qemu-system-mips
+	    CROSS_COMPILE=1
+	    ;;
+	mips64)
+	    DEBIAN_ARCH=mips
+	    ARCH_TRIPLE=mips-linux-gnu
+
+	    KERNEL_ARCH=mips
+	    BITS=64
+
+	    QEMU_PACKAGE=qemu-system-mips
+	    QEMU_BIN=qemu-system-mips64
+	    CROSS_COMPILE=1
+	    ;;
+	sparc)
+	    DEBIAN_ARCH=sparc
+	    ARCH_TRIPLE=sparc64-linux-gnu
+
+	    KERNEL_ARCH=sparc
+	    BITS=32
+
+	    QEMU_PACKAGE=qemu-system-sparc
+	    QEMU_BIN=qemu-system-sparc
+	    CROSS_COMPILE=1
+	    ;;
+	sparc64)
+	    DEBIAN_ARCH=sparc
+	    ARCH_TRIPLE=sparc64-linux-gnu
+
+	    KERNEL_ARCH=sparc
+	    BITS=64
+
+	    QEMU_PACKAGE=qemu-system-sparc
+	    QEMU_BIN=qemu-system-sparc64
+	    CROSS_COMPILE=1
+	    ;;
+	ppc|powerpc)
+	    DEBIAN_ARCH=powerpc
+	    MIRROR=http://deb.debian.org/debian-ports
+
+	    ARCH_TRIPLE=powerpc-linux-gnu
+
+	    KERNEL_ARCH=powerpc
+	    BITS=32
+
+	    QEMU_PACKAGE=qemu-system-ppc
+	    QEMU_BIN=qemu-system-ppc
+	    CROSS_COMPILE=1
+	    ;;
+	ppc64)
+	    DEBIAN_ARCH=ppc64
+	    MIRROR=http://deb.debian.org/debian-ports
+
+	    ARCH_TRIPLE=powerpc-linux-gnu
+
+	    KERNEL_ARCH=powerpc
+	    BITS=64
+
+	    QEMU_PACKAGE=qemu-system-ppc
+	    QEMU_BIN=qemu-system-ppc64
+	    CROSS_COMPILE=1
+	    ;;
+	*)
+	    echo "Unsupported architecture $1"
+	    exit 1
+    esac
+
+#    if [[ $ktest_arch != $(uname -m) ]]; then
+#	CROSS_COMPILE=1
+#    fi
+}
+
+checkdep()
+{
+	local dep=$1
+	local package=$dep
+
+	if [[ $# -ge 2 ]]; then
+	    package=$2
+	else
+	    package=$dep
+	fi
+
+	local found=0
+
+	if [[ ${dep:0:1} = / ]]; then
+	    # absolute path
+	    [[ -e $dep ]] && found=1
+	else
+	    which "$dep" > /dev/null 2>&1 && found=1
+	fi
+
+	if [[ $found = 0 ]]; then
+		echo -n "$dep not found"
+
+		if which apt-get > /dev/null 2>&1 && \
+			which sudo > /dev/null 2>&1; then
+			echo ", installing $package:"
+			sudo apt-get -qq install --no-install-recommends "$package"
+		else
+			echo ", please install"
+			exit 1
+		fi
+	fi
+}
+
+checkdep_arch()
+{
+    checkdep $QEMU_BIN $QEMU_PACKAGE
+
+    if [[ -z $ktest_root_image ]]; then
+	if [[ -f $HOME/.ktest/root.$DEBIAN_ARCH ]]; then
+	    ktest_root_image="$HOME/.ktest/root.$DEBIAN_ARCH"
+	elif [[ -f /var/lib/ktest/root.$DEBIAN_ARCH ]]; then
+	    ktest_root_image=/var/lib/ktest/root.$DEBIAN_ARCH
+	else
+	    echo "Root image not found in $HOME/.ktest/root.$DEBIAN_ARCH or /var/lib/ktest/root.$DEBIAN_ARCH"
+	    echo "Use $ktest_dir/root_image create"
+	    exit 1
+	fi
+    fi
+}
diff --git a/lib/libktest.sh b/lib/libktest.sh
index 99bccc1..5a08a26 100644
--- a/lib/libktest.sh
+++ b/lib/libktest.sh
@@ -85,23 +85,6 @@ parse_ktest_arg()
     esac
 }
 
-checkdep_arch()
-{
-    checkdep $QEMU_BIN $QEMU_PACKAGE
-
-    if [[ -z $ktest_root_image ]]; then
-	if [[ -f $HOME/.ktest/root.$DEBIAN_ARCH ]]; then
-	    ktest_root_image="$HOME/.ktest/root.$DEBIAN_ARCH"
-	elif [[ -f /var/lib/ktest/root.$DEBIAN_ARCH ]]; then
-	    ktest_root_image=/var/lib/ktest/root.$DEBIAN_ARCH
-	else
-	    echo "Root image not found in $HOME/.ktest/root.$DEBIAN_ARCH or /var/lib/ktest/root.$DEBIAN_ARCH"
-	    echo "Use $ktest_dir/root_image create"
-	    exit 1
-	fi
-    fi
-}
-
 parse_args_post()
 {
     parse_arch "$ktest_arch"
diff --git a/lib/util.sh b/lib/util.sh
index 5d6c17d..6e1d99a 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -23,145 +23,3 @@ get_tmpdir()
 	ktest_tmp=$(mktemp --tmpdir -d $(basename "$0")-XXXXXXXXXX)
     fi
 }
-
-checkdep()
-{
-	local dep=$1
-	local package=$dep
-
-	if [[ $# -ge 2 ]]; then
-	    package=$2
-	else
-	    package=$dep
-	fi
-
-	local found=0
-
-	if [[ ${dep:0:1} = / ]]; then
-	    # absolute path
-	    [[ -e $dep ]] && found=1
-	else
-	    which "$dep" > /dev/null 2>&1 && found=1
-	fi
-
-	if [[ $found = 0 ]]; then
-		echo -n "$dep not found"
-
-		if which apt-get > /dev/null 2>&1 && \
-			which sudo > /dev/null 2>&1; then
-			echo ", installing $package:"
-			sudo apt-get -qq install --no-install-recommends "$package"
-		else
-			echo ", please install"
-			exit 1
-		fi
-	fi
-}
-
-ktest_arch=$(uname -m)
-CROSS_COMPILE=""
-
-parse_arch()
-{
-    case $1 in
-	x86|i386)
-	    ktest_arch=x86
-	    DEBIAN_ARCH=i386
-	    ARCH_TRIPLE=x86-linux-gnu
-
-	    KERNEL_ARCH=x86
-	    BITS=32
-
-	    QEMU_PACKAGE=qemu-system-x86
-	    QEMU_BIN=qemu-system-x86_64
-	    ;;
-	x86_64|amd64)
-	    ktest_arch=x86_64
-	    DEBIAN_ARCH=amd64
-	    ARCH_TRIPLE=x86_64-linux-gnu
-
-	    KERNEL_ARCH=x86
-	    BITS=64
-
-	    QEMU_PACKAGE=qemu-system-x86
-	    QEMU_BIN=qemu-system-x86_64
-	    ;;
-	mips)
-	    DEBIAN_ARCH=mips
-	    ARCH_TRIPLE=mips-linux-gnu
-
-	    KERNEL_ARCH=mips
-	    BITS=32
-
-	    QEMU_PACKAGE=qemu-system-mips
-	    QEMU_BIN=qemu-system-mips
-	    CROSS_COMPILE=1
-	    ;;
-	mips64)
-	    DEBIAN_ARCH=mips
-	    ARCH_TRIPLE=mips-linux-gnu
-
-	    KERNEL_ARCH=mips
-	    BITS=64
-
-	    QEMU_PACKAGE=qemu-system-mips
-	    QEMU_BIN=qemu-system-mips64
-	    CROSS_COMPILE=1
-	    ;;
-	sparc)
-	    DEBIAN_ARCH=sparc
-	    ARCH_TRIPLE=sparc64-linux-gnu
-
-	    KERNEL_ARCH=sparc
-	    BITS=32
-
-	    QEMU_PACKAGE=qemu-system-sparc
-	    QEMU_BIN=qemu-system-sparc
-	    CROSS_COMPILE=1
-	    ;;
-	sparc64)
-	    DEBIAN_ARCH=sparc
-	    ARCH_TRIPLE=sparc64-linux-gnu
-
-	    KERNEL_ARCH=sparc
-	    BITS=64
-
-	    QEMU_PACKAGE=qemu-system-sparc
-	    QEMU_BIN=qemu-system-sparc64
-	    CROSS_COMPILE=1
-	    ;;
-	ppc|powerpc)
-	    DEBIAN_ARCH=powerpc
-	    MIRROR=http://deb.debian.org/debian-ports
-
-	    ARCH_TRIPLE=powerpc-linux-gnu
-
-	    KERNEL_ARCH=powerpc
-	    BITS=32
-
-	    QEMU_PACKAGE=qemu-system-ppc
-	    QEMU_BIN=qemu-system-ppc
-	    CROSS_COMPILE=1
-	    ;;
-	ppc64)
-	    DEBIAN_ARCH=ppc64
-	    MIRROR=http://deb.debian.org/debian-ports
-
-	    ARCH_TRIPLE=powerpc-linux-gnu
-
-	    KERNEL_ARCH=powerpc
-	    BITS=64
-
-	    QEMU_PACKAGE=qemu-system-ppc
-	    QEMU_BIN=qemu-system-ppc64
-	    CROSS_COMPILE=1
-	    ;;
-	*)
-	    echo "Unsupported architecture $1"
-	    exit 1
-    esac
-
-#    if [[ $ktest_arch != $(uname -m) ]]; then
-#	CROSS_COMPILE=1
-#    fi
-}