updated build system

scripts/docker_common.sh

@@ -19,29 +19,24 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
   docker rm ${DOCKER_CONTAINER}
 fi
 
+if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
+  PLATFORM_TYPE="linux/arm64"
+else
+  PLATFORM_TYPE="linux/amd64"
+fi
+
 pushd "${PROJECT_SOURCE_DIR}/support"
 cp -f ${PROJECT_SOURCE_DIR}/docker/${PROJECT_BUILD_ARCH}/${DOCKER_NAME} Dockerfile
 
-if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
-  docker build ${APP_VERSION_BUILD_ARGS} \
-    --platform linux/arm64 \
-    --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
-    --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
-    --build-arg NUM_JOBS=${NUM_JOBS} \
-    --build-arg UID=$(id -u) \
-    --build-arg GID=$(id -g) \
-    --build-arg USERNAME=$(id -un) \
-    -t ${DOCKER_TAG} . || exit 1
-else
-  docker build ${APP_VERSION_BUILD_ARGS} \
-    --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
-    --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
-    --build-arg NUM_JOBS=${NUM_JOBS} \
-    --build-arg UID=$(id -u) \
-    --build-arg GID=$(id -g) \
-    --build-arg USERNAME=$(id -un) \
-    -t ${DOCKER_TAG} . || exit 1
-fi
+docker build ${APP_VERSION_BUILD_ARGS} \
+  --platform ${PLATFORM_TYPE} \
+  --build-arg C_STANDARD=${PROJECT_C_STANDARD} \
+  --build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
+  --build-arg NUM_JOBS=${NUM_JOBS} \
+  --build-arg UID=$(id -u) \
+  --build-arg GID=$(id -g) \
+  --build-arg USERNAME=$(id -un) \
+  -t ${DOCKER_TAG} . || exit 1
 rm Dockerfile
 popd
 

scripts/run_tests.sh

@@ -5,15 +5,14 @@ PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 0
 
 pushd "${PROJECT_DIST_DIR}"
-if [ -e "./${PROJECT_NAME}_test${PROJECT_APP_BINARY_EXT}" ]; then
-  for APP in ${PROJECT_APP_LIST[@]}; do
-    if [[ "$APP" == *_test ]]; then
-      if [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
-        wine64 "${PROJECT_DIST_DIR}/${PROJECT_NAME}_test${PROJECT_APP_BINARY_EXT}" || exit 1
-      else
-        "./${PROJECT_NAME}_test${PROJECT_APP_BINARY_EXT}" || exit 1
-      fi
+for APP in ${PROJECT_APP_LIST[@]}; do
+  APP_BIN="${APP}_test${PROJECT_APP_BINARY_EXT}"
+  if [ -e "./${APP_BIN}" ]; then
+    if [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
+      wine64 "${PROJECT_DIST_DIR}/${APP_BIN}" || exit 1
+    else
+      "./${APP_BIN}" || exit 1
     fi
-  done
-fi
+  fi
+done
 popd