Change the layout a bit

... to a more natural installation paths, and also include ct-ng into
$PATH in the containers.

Signed-off-by: Alexey Neyman <stilor@att.net>

3 files changed, 4 insertions, 12 deletions

diff --git a/testing/docker/common-scripts/ctng-build-sample b/testing/docker/common-scripts/ctng-build-sample
index 6a6de6a..ef823ee 100755
--- a/testing/docker/common-scripts/ctng-build-sample
+++ b/testing/docker/common-scripts/ctng-build-sample
@@ -1,9 +1,5 @@
 #!/bin/bash
 
 set -e
-cd
-rm -rf work/bld-samples
-mkdir -p work/bld-samples work/inst-xtools
-cd work/bld-samples
-export PATH=$HOME/work/inst-ctng/bin:$PATH
-ct-ng build-all CT_PREFIX=$HOME/work/inst-xtools ${1+CT_SAMPLES="$*"}
+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 500cb73..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 work/bld-ctng work/inst-ctng
-mkdir work/bld-ctng
-cd work/bld-ctng
-/crosstool-ng/configure --prefix=$HOME/work/inst-ctng
+cd work
+/crosstool-ng/configure --prefix=/opt/ctng
 make
 make install
diff --git a/testing/docker/common-scripts/ctng-test-basic b/testing/docker/common-scripts/ctng-test-basic
index 0edb899..a811ec6 100755
--- a/testing/docker/common-scripts/ctng-test-basic
+++ b/testing/docker/common-scripts/ctng-test-basic
@@ -2,7 +2,6 @@
 
 set -e
 cd
-export PATH=$HOME/work/inst-ctng/bin:$PATH
 ct-ng help
 ct-ng list-samples
 ct-ng list-steps