Revert "Start moving away from --enable-schroot-test to --testcontainer."

This reverts commit 6159c618ae4f92e01fcc49770da42e8818c0de33.

While this change is correct, many sanitizer tests fail due to
output pattern match.  It appears sanitizers don't play well with
dynamic linker being called explicitly.

Change-Id: I9e7a374a30e339d184876b5de8168a5eff0c8cdf

2 files changed, 1 insertions, 47 deletions

diff --git a/config/boards/abe-container.exp b/config/boards/abe-container.exp
index 80186483..83d0d141 100644
--- a/config/boards/abe-container.exp
+++ b/config/boards/abe-container.exp
@@ -3,5 +3,3 @@ load_generic_config tcwg-remote
 global env
 # Note, the below value of hostname is hardcoded in schroot.sh:start_schroot_session
 set_board_info hostname [getenv ABE_TEST_CONTAINER_USER]@[getenv ABE_TEST_CONTAINER_MACHINE]
-
-set board_info($board,exec_shell) "[board_info $board exec_shell] [getenv ABE_TEST_LDSO] --library-path [getenv ABE_TEST_LIB_PATH]"
diff --git a/lib/make.sh b/lib/make.sh
index b7f7f6bc..9bb3b0fb 100755
--- a/lib/make.sh
+++ b/lib/make.sh
@@ -596,44 +596,6 @@ make_install()
     return 0
 }
 
-# Copy sysroot to test container and print out ABE_TEST_* settings to pass
-# to dejagnu.
-# $1 -- test container
-print_make_opts_and_copy_sysroot ()
-{
-    (set -e
-     local test_container="$1"
-
-     local user machine port
-     user="$(echo $test_container | cut -s -d@ -f 1)"
-     machine="$(echo $test_container | sed -e "s/.*@//g" -e "s/:.*//g")"
-     port="$(echo $test_container | cut -s -d: -f 2)"
-
-     if [ x"$port" = x"" ]; then
-	 error "Wrong format of test_container: $test_container"
-	 return 1
-     fi
-
-     if [ x"$user" = x"" ]; then
-	 user=$(ssh -p$port $machine whoami)
-     fi
-
-     local ldso lib_path dest_ldso dest_lib_path
-     ldso=$(find_dynamic_linker "$sysroots" true)
-     lib_path=$(dirname "$ldso")
-
-     dest_lib_path=$(ssh -p$port $user@$machine mktemp -d)
-     dest_ldso="$dest_lib_path/$(basename $ldso)"
-
-     if ! rsync -az --delete -e "ssh -p$port" "$lib_path/" "$user@$machine:$dest_lib_path/"; then
-	 error "Cannot rsync sysroot to $user@machine:$port:$dest_lib_path/"
-	 return 1
-     fi
-
-     echo "ABE_TEST_CONTAINER_USER=$user ABE_TEST_CONTAINER_MACHINE=$machine SCHROOT_PORT=$port ABE_TEST_LDSO=$dest_ldso ABE_TEST_LIB_PATH=$dest_lib_path"
-    )
-}
-
 # $1 - The component to test
 # $2 - If set to anything, installed tools are used'
 make_check()
@@ -726,13 +688,7 @@ make_check()
 	# in config/linaro.exp
 	export SCHROOT_TEST="$schroot_test"
 
-	if $exec_tests && [ x"$test_container" != x"" ]; then
-	    schroot_make_opts=$(print_make_opts_and_copy_sysroot "$test_container")
-	    if [ $? -ne 0 ]; then
-		error "Cannot initialize sysroot on $test_container"
-		return 1
-	    fi
-	elif $exec_tests && [ x"$schroot_test" = x"yes" ]; then
+	if $exec_tests && [ x"$schroot_test" = x"yes" ]; then
 	    # Start schroot sessions on target boards that support it
 	    start_schroot_sessions "${target}" "${sysroots}" "${builddir}"
 	    if test $? -ne 0; then