tdd alpine ilp32 -12345 working

Signed-off-by: Geoff Levand <[email protected]>
glevand · Mar 7, 2020 · 907d6cc · 907d6cc
1 parent fb7a5c8
commit 907d6cc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/scripts/build-ilp32-docker-image.sh b/scripts/build-ilp32-docker-image.sh
@@ -188,8 +188,6 @@ build_toolup() {
 build_toolchain() {
 	mkdir -p ${toolchain_dest_pre}
 
-#	printenv
-#			--volumes-from $(get_container_id) \
 	local common_parent
 
 	if [[ ${DEBUG_TOOLCHAIN_SRC} && -d "${DEBUG_TOOLCHAIN_SRC}" ]]; then

diff --git a/scripts/build-ilp32-test-program.sh b/scripts/build-ilp32-test-program.sh
@@ -117,14 +117,18 @@ fi
 
 mkdir -p "${build_top}"
 
+container_id=$(get_container_id)
+
+if [[ ! ${container_id} ]]; then
+	DOCKER_EXTRA_ARGS+=" --docker-args="-v ${build_top}:${build_top}""
+fi
+
 ${SCRIPTS_TOP}/enter-ilp32-builder.sh \
 	--verbose \
-	--container-name=build-${test_name}--$(date +%H-%M-%S) \
+	--container-name="build-${test_name}--$(date +%H-%M-%S)" \
 	--work-dir="${build_top}" \
-	--docker-args="\
-		-v AA1${PROJECT_TOP}:${PROJECT_TOP}:ro \
-		-v AA2${build_top}:${build_top} \
-	-- ${src_top}/build-${test_name}.sh \
+	${DOCKER_EXTRA_ARGS} \
+	-- "${src_top}/build-${test_name}.sh \
 		--verbose \
 		--build-top=${build_top} \
 		--prefix=${prefix}"

diff --git a/scripts/enter-ilp32-toolup.sh b/scripts/enter-ilp32-toolup.sh
@@ -157,11 +157,19 @@ if [[ ! ${as_root} ]]; then
 	"}
 fi
 
+container_id=$(get_container_id)
+
+if [[ ${container_id} ]]; then
+	DOCKER_VOLUMES+=" --volumes-from ${container_id}"
+else
+	DOCKER_VOLUMES+=" -v ${PROJECT_TOP}:${PROJECT_TOP}:ro"
+fi
+
 HISTFILE="${HISTFILE:-${work_dir}/${container_name}--bash_history}"
 
 docker run --rm   \
+	${DOCKER_VOLUMES} \
 	${USER_ARGS} \
-	-v ${PROJECT_TOP}:${PROJECT_TOP}:ro \
 	-w ${work_dir} \
 	-e HISTFILE=${HISTFILE} \
 	--network host \