diff --git a/adt b/adt index a5feb51..2f04a3e 100755 --- a/adt +++ b/adt @@ -515,7 +515,7 @@ function TESTS _info "You MUST run \"./adt -c\" if you want to generate a full clean test build" _info "Using cross-compiler: $(which ppc-amigaos-gcc)" _info "If errors occur the look at the relevant log file in the test directory" - make -s -C "${TESTS_DIR}" all || _error "An error occurred while trying to build the tests" 120 + make -C "${TESTS_DIR}" all || _error "An error occurred while trying to build the tests" 120 _info "Finished building tests..." _info "\"${FINAL_LHA}\" can be copied to an AmigaOne machine. Extract it and run: \"execute run_all.script\"." _info "By default, the script extracts everything, appropriately, and executes a script, \"user.script\"" diff --git a/tests/common.mak b/tests/common.mak index 68faa32..8c2a94d 100644 --- a/tests/common.mak +++ b/tests/common.mak @@ -62,11 +62,13 @@ $(LHA_FILE): $(PROG) $(RUN_TEST_SCRIPT) ifneq ($(DYN),) $(call LOG_CMD,Listing Shared Objects,,) ARR_SO=($$($(READELF) -d $(PROG) 2>/dev/null | grep NEEDED | sed 's,.*\[\(.*\)\],\1,')) ; \ + echo "OUT1 $(LHA_FILE): $${ARR_SO[*]}" ; \ for SO in $${ARR_SO[@]} ; \ do \ LOC=$$(find $${CROSS_PREFIX} -name "$${SO}" | \ grep $(GREP_OPT_C_LIB) | \ grep "ppc-amigaos") ; \ + echo "OUT2 $(LHA_FILE): $${LOC}" ; \ if [[ -z "$${LOC}" ]] ; \ then \ LOC=$$(find . -name "$${SO}") ; \ diff --git a/tests/makefile b/tests/makefile index 5cef313..7c0e321 100644 --- a/tests/makefile +++ b/tests/makefile @@ -49,12 +49,10 @@ endif $(EXPORT) ; \ for TEST in $(tests) ; \ do \ - $(MAKE) -C "$${TEST}" all 1>>$(TMP_LOG_RESULTS_FILE) 2>&1 & \ - pids+=( $$! ) ; \ + $(MAKE) -C "$${TEST}" all 1>>$(TMP_LOG_RESULTS_FILE) 2>&1 ; \ done ; \ done ; \ done ; \ - for p in $${pids[@]} ; do wait $$p ; done sort -o $(TMP_LOG_RESULTS_FILE) $(TMP_LOG_RESULTS_FILE) cat $(TMP_LOG_RESULTS_FILE) cd .. && $(LHA_ADD) \