5 files changed, 14 insertions, 33 deletions
diff --git a/testing/docker/common-scripts/ctng-build-sample b/testing/docker/common-scripts/ctng-build-sample
new file mode 100755
index 0000000..ef823ee
--- /dev/null
+++ b/testing/docker/common-scripts/ctng-build-sample
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+cd work
+ct-ng build-all ${1+CT_SAMPLES="$*"}
diff --git a/testing/docker/common-scripts/ctng-install b/testing/docker/common-scripts/ctng-install
index f29093a..6994fd5 100755
--- a/testing/docker/common-scripts/ctng-install
+++ b/testing/docker/common-scripts/ctng-install
@@ -1,10 +1,7 @@
 #!/bin/bash
 
 set -e
-cd
-rm -rf bld-ctng
-mkdir bld-ctng
-cd bld-ctng
-/crosstool-ng/configure --prefix=$HOME/inst-ctng
+cd work
+/crosstool-ng/configure --prefix=/opt/ctng
 make
 make install
diff --git a/testing/docker/common-scripts/ctng-test-all b/testing/docker/common-scripts/ctng-test-all
deleted file mode 100755
index f0ba266..0000000
--- a/testing/docker/common-scripts/ctng-test-all
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-cd
-rm -rf bld-samples
-mkdir bld-samples
-cd bld-samples
-export PATH=$HOME/inst-ctng/bin:$PATH
-ct-ng help
-ct-ng list-samples
-ct-ng list-steps
-ct-ng build-all
diff --git a/testing/docker/common-scripts/ctng-test-basic b/testing/docker/common-scripts/ctng-test-basic
new file mode 100755
index 0000000..a811ec6
--- /dev/null
+++ b/testing/docker/common-scripts/ctng-test-basic
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+cd
+ct-ng help
+ct-ng list-samples
+ct-ng list-steps
diff --git a/testing/docker/common-scripts/su-as-user b/testing/docker/common-scripts/su-as-user
deleted file mode 100755
index 99246f2..0000000
--- a/testing/docker/common-scripts/su-as-user
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-usr=$1
-uid=$2
-grp=$3
-gid=$4
-shift 4
-
-groupadd -g ${gid} ${grp}
-useradd -d /home/${usr} -m -g ${gid} -u ${uid} ${usr}
-ln -sf /src /home/${usr}/src
-if [ -z "$*" ]; then
-    exec su -l ${usr}
-else
-    exec su -l -c "/bin/bash -c '$*'" ${usr}
-fi