alpine tests + CI

martin-zemek · martin-zemek · commit c9f295e410da · 2021-01-28T10:22:50.000+01:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,21 +1,42 @@
 stages:
   - test
 
-test:
-  stage: test
-  image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:develop
+default:
   tags:
     - docker-exec
-  variables:
-    REPO_NAME: module-process
-  script:
+  before_script:
     - |
         curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \
         -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \
         -d "{\"state\": \"pending\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}"
+    - set +e
+
+variables:
+  REPO_NAME: module-process
+
+test-ubuntu:
+  stage: test
+  image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:develop
+  script:
+    - |
+        if test/docker_test/test-ubuntu.sh; then
+          curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \
+            -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \
+            -d "{\"state\": \"success\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}"
+          exit 0
+        else
+          curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \
+            -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \
+            -d "{\"state\": \"failure\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}"
+          exit 1
+        fi
+
+test-alpine:
+  stage: test
+  image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:develop-alpine
+  script:
     - |
-        set +e
-        if test/docker_test/test.sh; then
+        if test/docker_test/test-alpine.sh; then
           curl "https://api.github.com/repos/qorelanguage/${REPO_NAME}/statuses/${CI_COMMIT_SHA}" \
             -X POST -u omusil24:${GITHUB_ACCESS_TOKEN} -H "Content-Type: application/json" \
             -d "{\"state\": \"success\", \"context\": \"${REPO_NAME}\", \"description\": \"Gitlab CI\", \"target_url\": \"${CI_JOB_URL}\"}"
diff --git a/src/QC_Process.qpp b/src/QC_Process.qpp
@@ -325,7 +325,7 @@ p.wait(); # a blocking/wait call
 printf("Sleep finished with code: %d\n", p.exitCode());
     @endcode
 
-    @return always returns \c True to keep compatibility with wait(timeout) version
+    @return \c True if child exited while waiting, otherwise return \c False
 
     @throw PROCESS-CHECK-ERROR in case child handle was not properly initialized
 
@@ -760,4 +760,4 @@ static list<float> Process::getLoadAvg() [flags=RET_VALUE_ONLY] {
         assert(!*xsink);
     }
     return rv.release();
-}
+}
diff --git a/src/processpriv.cpp b/src/processpriv.cpp
@@ -722,14 +722,17 @@ bool ProcessPriv::wait(ExceptionSink* xsink) {
         return false;
 
     try {
-        if (m_process->valid()) {
+        if (m_process->valid() && m_process->running()) {
             m_process->wait();
 
             // get exit code if possible
             getExitCode(xsink);
 
             // rethrows any background exceptions
             finalizeStreams(xsink);
+        } else {
+            // invalidate the exit code since the return value of m_process->exit_code() is without any meaning now
+            exit_code = 0;
         }
         return true;
     } catch (const std::exception& ex) {
@@ -766,20 +769,21 @@ bool ProcessPriv::wait(int64 t, ExceptionSink* xsink) {
 
                 return true;
             }
+        } else {
+            // invalidate the exit code since the return value of m_process->exit_code() is without any meaning now
+            exit_code = 0;
         }
         return false;
     } catch (const std::exception& ex) {
         // ignore errors if the process has already terminated
         const char* err = ex.what();
         if (!strcmp("wait error: No child processes", err)) {
             // get exit code if possible
-            try {
-                exit_code = m_process->exit_code();
-            } catch (const std::exception& ex) {
-                xsink->raiseException("PROCESS-EXITCODE-ERROR", ex.what());
-            }
+            getExitCode(xsink);
+
             // rethrows any background exceptions
             finalizeStreams(xsink);
+
             return true;
         } else {
             xsink->raiseException("PROCESS-WAIT-ERROR", err);
diff --git a/test/docker_test/test-alpine.sh b/test/docker_test/test-alpine.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -e
+set -x
+
+ENV_FILE=/tmp/env.sh
+
+. ${ENV_FILE}
+
+# setup MODULE_SRC_DIR env var
+cwd=`pwd`
+if [ -z "${MODULE_SRC_DIR}" ]; then
+    if [ -e "$cwd/src/processpriv.cpp" ] || [ -e "$cwd/src/process.qpp" ]; then
+        MODULE_SRC_DIR=$cwd
+    else
+        MODULE_SRC_DIR=$WORKDIR/module-process
+    fi
+fi
+echo "export MODULE_SRC_DIR=${MODULE_SRC_DIR}" >> ${ENV_FILE}
+
+echo "export QORE_UID=1000" >> ${ENV_FILE}
+echo "export QORE_GID=1000" >> ${ENV_FILE}
+
+. ${ENV_FILE}
+
+export MAKE_JOBS=4
+
+# build module and install
+echo && echo "-- building module --"
+mkdir -p ${MODULE_SRC_DIR}/build
+cd ${MODULE_SRC_DIR}/build
+cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}
+make -j${MAKE_JOBS}
+make install
+
+# add Qore user and group
+if ! grep -q "^qore:x:${QORE_GID}" /etc/group; then
+    addgroup -g ${QORE_GID} qore
+fi
+if ! grep -q "^qore:x:${QORE_UID}" /etc/passwd; then
+    adduser -u ${QORE_UID} -D -G qore -h /home/qore -s /bin/bash qore
+fi
+
+# own everything by the qore user
+chown -R qore:qore ${MODULE_SRC_DIR}
+
+# run the tests
+export QORE_MODULE_DIR=${MODULE_SRC_DIR}/qlib:${QORE_MODULE_DIR}
+cd ${MODULE_SRC_DIR}
+for test in test/*.qtest; do
+    gosu qore:qore qore $test -vv
+done
diff --git a/test/docker_test/test-ubuntu.sh b/test/docker_test/test-ubuntu.sh
@@ -9,7 +9,7 @@ ENV_FILE=/tmp/env.sh
 
 # setup MODULE_SRC_DIR env var
 cwd=`pwd`
-if [ "${MODULE_SRC_DIR}" = "" ]; then
+if [ -z "${MODULE_SRC_DIR}" ]; then
     if [ -e "$cwd/src/processpriv.cpp" ] || [ -e "$cwd/src/process.qpp" ]; then
         MODULE_SRC_DIR=$cwd
     else
@@ -27,9 +27,8 @@ export MAKE_JOBS=4
 
 # build module and install
 echo && echo "-- building module --"
-cd ${MODULE_SRC_DIR}
-mkdir build
-cd build
+mkdir -p ${MODULE_SRC_DIR}/build
+cd ${MODULE_SRC_DIR}/build
 cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}
 make -j${MAKE_JOBS}
 make install
@@ -46,4 +45,4 @@ export QORE_MODULE_DIR=${MODULE_SRC_DIR}/qlib:${QORE_MODULE_DIR}
 cd ${MODULE_SRC_DIR}
 for test in test/*.qtest; do
     gosu qore:qore qore $test -vv
-done
+done
diff --git a/test/process.qtest b/test/process.qtest
@@ -12,6 +12,10 @@
 our *softbool VERBOSE;
 our Main MAIN;
 
+bool sub isAlpine() {
+    return (ENV.MACHTYPE ?? "").find("alpine") > -1;
+}
+
 class EmptyClass {
     constructor() {}
 }
@@ -45,7 +49,8 @@ public class Main inherits QUnit::Test {
                 "searchPathTest_out": "^(/usr)?/bin/ls$",
                 "simpleTest_exe": "ls",
                 "simpleTest_arg": ("-l", "-s",),
-                "executorsTest_success": "Success",
+                "executorsTest_success": isAlpine() ? "No error information" : "Success",
+                "executorsTest_exit_code_127": isAlpine() ? 383 : 127,
             },
             "WINDOWS": {
                 "searchPathTest_in": "timeout",
@@ -398,7 +403,7 @@ public class Main inherits QUnit::Test {
                         printf("    on_success attribute: %y\n", e);
 
                     assertEq("on_success", e.name, "name check");
-                    assertEq(127, e.exit, "on_success exit code check");
+                    assertEq(getTestValue("executorsTest_exit_code_127"), e.exit, "on_success exit code check");
                     assertEq(m_prefix + getTestValue("testTrue"), e.exe, "on_success exe check");
                     assertEq(0, e.error_code, "on_success error_code check");
                     assertEq(getTestValue("executorsTest_success"), e.error_message, "on_success error_message check");
@@ -441,7 +446,7 @@ public class Main inherits QUnit::Test {
             printf("executorMethod: %y\n", e);
 
         assertEq("on_success", e.name, "name check");
-        assertEq(127, e.exit, "on_success exit code check");
+        assertEq(getTestValue("executorsTest_exit_code_127"), e.exit, "on_success exit code check");
         assertEq(m_prefix + getTestValue("testTrue"), e.exe, "on_success exe check");
         assertEq(0, e.error_code, "on_success error_code check");
         assertEq(getTestValue("executorsTest_success"), e.error_message, "on_success error_message check");
@@ -453,7 +458,7 @@ public class Main inherits QUnit::Test {
             printf("executorStaticMethod: %y\n", e);
 
         MAIN.assertEq("on_success", e.name, "name check");
-        MAIN.assertEq(127, e.exit, "on_success exit code check");
+        MAIN.assertEq(MAIN.getTestValue("executorsTest_exit_code_127"), e.exit, "on_success exit code check");
         MAIN.assertEq(MAIN.prefix() + MAIN.getTestValue("testTrue"), e.exe, "on_success exe check");
         MAIN.assertEq(0, e.error_code, "on_success error_code check");
         MAIN.assertEq(MAIN.getTestValue("executorsTest_success"), e.error_message, "on_success error_message check");
@@ -466,7 +471,7 @@ public class Main inherits QUnit::Test {
             printf("executorNoHash: %y\n", e);
 
         assertEq("on_success", e.name, "name check");
-        assertEq(127, e.exit, "on_success exit code check");
+        assertEq(getTestValue("executorsTest_exit_code_127"), e.exit, "on_success exit code check");
         assertEq(m_prefix + getTestValue("testTrue"), e.exe, "on_success exe check");
         assertEq(0, e.error_code, "on_success error_code check");
         assertEq(getTestValue("executorsTest_success"), e.error_message, "on_success error_message check");
@@ -829,7 +834,7 @@ sub run_bg(Counter cnt, Process p, Main m) {
 sub executor_func(hash<auto> e) {
     if (VERBOSE > 2) printf("executor_func: %y\n", e);
     MAIN.assertEq("on_success", e.name, "name check");
-    MAIN.assertEq(127, e.exit, "on_success exit code check");
+    MAIN.assertEq(MAIN.getTestValue("executorsTest_exit_code_127"), e.exit, "on_success exit code check");
     MAIN.assertEq(MAIN.prefix() + MAIN.getTestValue("testTrue"), e.exe, "on_success exe check");
     MAIN.assertEq(0, e.error_code, "on_success error_code check");
     MAIN.assertEq(MAIN.getTestValue("executorsTest_success"), e.error_message, "on_success error_message check");
