Implement test with bash_unit

Author: mistraloz

Makefile

@@ -16,16 +16,18 @@ test-quick:  ## Test 8.0 and 8.1 quickly
 test-8.1:  ## Test php8.1 build only
 	VERSION=8.1 VARIANT=cli $(MAKE) _test-version
 	VERSION=8.1 VARIANT=apache $(MAKE) _test-version
+	VERSION=8.1 VARIANT=fpm $(MAKE) _test-version
 
 test-8.0:  ## Test php8.0 build only
 	VERSION=8.0 VARIANT=cli $(MAKE) _test-version
 	VERSION=8.0 VARIANT=apache $(MAKE) _test-version
+	VERSION=8.0 VARIANT=fpm $(MAKE) _test-version
 
 _test-version: _test-prerequisites ## Test php build for VERSION="" and VARIANT=""
 	docker buildx bake --load \
 	    --set "*.platform=$$(uname -p)" \
-		php$${VERSION//.}-cli
-	PHP_VERSION="$(VERSION)" BRANCH=v4 VARIANT=cli ./test-image.sh || (notify-send -u critical "Tests failed ($(VERSION)-$(VARIANT))" && exit 1)
+		php$${VERSION//.}-$(VARIANT)-all
+	PHP_VERSION="$(VERSION)" BRANCH=v4 VARIANT=$(VARIANT) ./tests-suite/bash_unit -f tap ./tests-suite/*.sh || (notify-send -u critical "Tests failed ($(VERSION)-$(VARIANT))" && exit 1)
 	notify-send -u critical "Tests passed with success ($(VERSION)-$(VARIANT))"
 
 clean: ## Clean dangles image after build

test-image.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 set -eE -o functrace
 
 failure() {
@@ -9,6 +8,9 @@ failure() {
 }
 trap 'failure ${LINENO} "$BASH_COMMAND"' ERR
 
+echo "This testing suite is deprecated : use instead bash_unit in tests-suite directory"
+sleep 5
+
 # Use either docker's 'build' command or 'buildx '
 export BUILDTOOL="buildx build --load --platform=${PLATFORM:-$(uname -p)}"
 
@@ -19,9 +21,6 @@ export BRANCH_VARIANT="${VARIANT//./-}"
 export DOCKER_BUILDKIT=1                   # Force use of BuildKit
 export BUILDKIT_STEP_LOG_MAX_SIZE=10485760 # output log limit fixed to 10MiB
 
-# Let's build the "slim" image.
-docker $BUILDTOOL -t "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-slim-${BRANCH_VARIANT}" --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg GLOBAL_VERSION="${BRANCH}" --build-arg BLACKFIRE_VERSION="${BLACKFIRE_VERSION}" -f "Dockerfile.slim.${VARIANT}" .
-
 # Let's check that the extensions can be built using the "ONBUILD" statement
 docker $BUILDTOOL -t test/slim_onbuild --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg BRANCH="$BRANCH" --build-arg BRANCH_VARIANT="$BRANCH_VARIANT" tests/slim_onbuild
 # This should run ok (the sudo disable environment variables but call to composer proxy does not trigger PHP ini file regeneration)
@@ -200,6 +199,8 @@ docker run --rm -e PHP_EXTENSION_XDEBUG=1 "thecodingmachine/php:${PHP_VERSION}-$
 # Let's check that "xdebug.mode" is properly overridden
 docker run --rm -e PHP_EXTENSION_XDEBUG=1 -e PHP_INI_XDEBUG__MODE=debug,coverage "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}" php -i | grep xdebug.mode | grep "debug,coverage"
 
+# TODO
+
 if [[ "${PHP_VERSION}" != "8.1" ]]; then
   # Tests that blackfire + xdebug will output an error
   RESULT="$(docker run --rm -e PHP_EXTENSION_XDEBUG=1 -e PHP_EXTENSION_BLACKFIRE=1 "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}" php -v 2>&1 | grep 'WARNING: Both Blackfire and Xdebug are enabled. This is not recommended as the PHP engine may not behave as expected. You should strongly consider disabling Xdebug or Blackfire.')"
@@ -214,12 +215,4 @@ docker $BUILDTOOL -t test/composer_with_gd --build-arg PHP_VERSION="${PHP_VERSIO
 docker run --rm test/composer_with_gd sudo composer update
 docker rmi test/composer_with_gd
 
-#################################
-# Let's build the "node" images
-#################################
-docker $BUILDTOOL -t "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node10" --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg GLOBAL_VERSION="${BRANCH}" -f "Dockerfile.${VARIANT}.node10" .
-docker $BUILDTOOL -t "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node12" --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg GLOBAL_VERSION="${BRANCH}" -f "Dockerfile.${VARIANT}.node12" .
-docker $BUILDTOOL -t "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node14" --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg GLOBAL_VERSION="${BRANCH}" -f "Dockerfile.${VARIANT}.node14" .
-docker $BUILDTOOL -t "thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node16" --build-arg PHP_VERSION="${PHP_VERSION}" --build-arg GLOBAL_VERSION="${BRANCH}" -f "Dockerfile.${VARIANT}.node16" .
-
 echo "Tests passed with success"

tests-suite/assets/apache/echo_memory_limit.php

@@ -0,0 +1,2 @@
+<?php
+echo ini_get('memory_limit');

tests-suite/assets/apache/htaccess/.htaccess

@@ -0,0 +1,3 @@
+RewriteEngine On
+
+RewriteRule .? test.php [L]

tests-suite/assets/apache/htaccess/test.php

@@ -0,0 +1,2 @@
+<?php
+echo 'foo';

tests-suite/assets/apache/index.php

@@ -0,0 +1,6 @@
+<?php
+if (!isset($_SERVER['MYVAR'])) {
+    echo "No variable set";
+} else {
+    echo $_SERVER['MYVAR'];
+}

tests-suite/assets/composer/Dockerfile

@@ -0,0 +1,12 @@
+ARG BRANCH
+ARG BRANCH_VARIANT
+ARG PHP_VERSION
+
+FROM thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}
+
+ENV PHP_EXTENSION_GD=1
+
+COPY composer.json composer.json
+
+# Let's check that GD is available.
+RUN composer install

tests-suite/assets/composer/composer.json

@@ -0,0 +1,5 @@
+{
+  "require": {
+    "ext-gd": "*"
+  }
+}