Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qore-uuid-module for
openSUSE:Factory checked in at 2021-11-23 22:10:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qore-uuid-module (Old)
and /work/SRC/openSUSE:Factory/.qore-uuid-module.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qore-uuid-module"
Tue Nov 23 22:10:29 2021 rev:5 rq:930756 version:1.4.0+qore1.0.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/qore-uuid-module/qore-uuid-module.changes
2021-08-01 21:51:41.427232322 +0200
+++
/work/SRC/openSUSE:Factory/.qore-uuid-module.new.1895/qore-uuid-module.changes
2021-11-23 22:12:42.858452499 +0100
@@ -1,0 +2,6 @@
+Mon Nov 1 08:43:06 UTC 2021 - Ferdinand Thiessen <[email protected]>
+
+- Update to version 1.4 for Qore version 1.0.10
+ * Fixed compatibility with OSSP UUID
+
+-------------------------------------------------------------------
Old:
----
module-uuid-release-0.9.15.tar.gz
New:
----
module-uuid-release-1.0.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qore-uuid-module.spec ++++++
--- /var/tmp/diff_new_pack.g8CruB/_old 2021-11-23 22:12:43.274451123 +0100
+++ /var/tmp/diff_new_pack.g8CruB/_new 2021-11-23 22:12:43.274451123 +0100
@@ -16,7 +16,7 @@
#
-%define qore_version 0.9.15
+%define qore_version 1.0.10
%define module_api %(qore --latest-module-api 2>/dev/null)
%define src_name module-uuid-release-%{qore_version}
Name: qore-uuid-module
@@ -34,8 +34,7 @@
BuildRequires: graphviz
BuildRequires: libuuid-devel
BuildRequires: qore
-BuildRequires: qore-devel >= 0.9
-Requires: %{_bindir}/env
+BuildRequires: qore-devel >= %{qore_version}
Requires: qore-module(abi)%{?_isa} = %{module_api}
%description
@@ -56,8 +55,7 @@
%build
%cmake
-%cmake_build
-make %{?_smp_mflags} docs
+%make_build docs
%install
%cmake_install
++++++ module-uuid-release-0.9.15.tar.gz -> module-uuid-release-1.0.10.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/.gitignore
new/module-uuid-release-1.0.10/.gitignore
--- old/module-uuid-release-0.9.15/.gitignore 2020-12-28 18:17:03.000000000
+0100
+++ new/module-uuid-release-1.0.10/.gitignore 2021-07-31 17:17:10.000000000
+0200
@@ -2,6 +2,7 @@
Makefile.in
acinclude.m4
aclocal.m4
+build/
compile
config.guess
config.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/.gitlab-ci.yml
new/module-uuid-release-1.0.10/.gitlab-ci.yml
--- old/module-uuid-release-0.9.15/.gitlab-ci.yml 2020-12-28
18:17:03.000000000 +0100
+++ new/module-uuid-release-1.0.10/.gitlab-ci.yml 2021-07-31
17:17:10.000000000 +0200
@@ -1,21 +1,42 @@
stages:
- test
-test:
- stage: test
- image: $CI_REGISTRY/infrastructure/qore-test-base/qore-test-base:5.0
+default:
tags:
- docker-exec
- variables:
- REPO_NAME: module-uuid
- 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-uuid
+
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/CMakeLists.txt
new/module-uuid-release-1.0.10/CMakeLists.txt
--- old/module-uuid-release-0.9.15/CMakeLists.txt 2020-12-28
18:17:03.000000000 +0100
+++ new/module-uuid-release-1.0.10/CMakeLists.txt 2021-07-31
17:17:10.000000000 +0200
@@ -57,7 +57,7 @@
docs/mainpage.doxygen.tmpl
)
-add_library(${module_name} SHARED ${QPP_SOURCES} ${CPP_SRC})
+add_library(${module_name} MODULE ${QPP_SOURCES} ${CPP_SRC})
qore_binary_module(${module_name}
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ${UUID_LIBRARY})
qore_user_modules("${QMOD}")
@@ -72,4 +72,3 @@
add_custom_target(QORE_MOD_DOX_FILES DEPENDS ${QORE_DOX_SRC})
add_dependencies(docs QORE_MOD_DOX_FILES)
endif()
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/Makefile.am
new/module-uuid-release-1.0.10/Makefile.am
--- old/module-uuid-release-0.9.15/Makefile.am 2020-12-28 18:17:03.000000000
+0100
+++ new/module-uuid-release-1.0.10/Makefile.am 2021-07-31 17:17:10.000000000
+0200
@@ -52,7 +52,7 @@
endif
mostlyclean-local:
- rm -rf ${DOXYGEN_OUTPUT} ${DX_CLEANFILES}
+ $(RM) -rf ${DOXYGEN_OUTPUT} ${DX_CLEANFILES}
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/configure.ac
new/module-uuid-release-1.0.10/configure.ac
--- old/module-uuid-release-0.9.15/configure.ac 2020-12-28 18:17:03.000000000
+0100
+++ new/module-uuid-release-1.0.10/configure.ac 2021-07-31 17:17:10.000000000
+0200
@@ -468,72 +468,82 @@
fi
if test "${with_uuid}" = yes; then
- if test "$windows" = yes; then
- # check if C++ compiler can link with UUID libs
- SAVE_CPPFLAGS="$CPPFLAGS"
- SAVE_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $UUID_CPPFLAGS"
- LIBS="$LIBS $UUID_LIBS"
+ if test "$windows" = yes; then
+ # check if C++ compiler can link with UUID libs
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $UUID_CPPFLAGS"
+ LIBS="$LIBS $UUID_LIBS"
- # see if the windows UUID support is available
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ # see if the windows UUID support is available
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <windows.h>
]],[[
UUID uuid; UuidCreate(&uuid);
]])], win_uuid=yes, win_uuid=no)
- if test "$win_uuid" = "no"; then
- AC_MSG_ERROR([failed to compile a test program with the Windows UUID
API])
- fi
+ if test "$win_uuid" = "no"; then
+ AC_MSG_ERROR([failed to compile a test program with the Windows UUID
API])
+ fi
- CPPFLAGS="$SAVE_CPPFLAGS"
- LIBS="$SAVE_LIBS"
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ LIBS="$SAVE_LIBS"
- AC_SUBST(UUID_LIBS)
- with_uuid=yes
+ AC_SUBST(UUID_LIBS)
+ with_uuid=yes
+ else
+ # only set include path if necessary
+ if test -n "$uuid_app_includes"; then
+ UUID_CPPFLAGS="-I$with_uuid_includes"
+ fi
+ if test -n "$uuid_static"; then
+ UUID_LIBS="$with_uuid_libs/libuuid.a"
else
- # only set include path if necessary
- if test -n "$uuid_app_includes"; then
- UUID_CPPFLAGS="-I$with_uuid_includes"
- fi
- if test -n "$uuid_static"; then
- UUID_LIBS="$with_uuid_libs/libuuid.a"
- else
- if test -n "$uuid_app_libs"; then
- UUID_LIBS="-L$with_uuid_libs -luuid"
- elif test "$with_uuid_libs" != "System"; then
- UUID_LIBS="-luuid"
- fi
- fi
-
- # check for uuid_unparse_upper() and uuid_unparse_lower()
- AC_MSG_CHECKING([for uuid_unparse_upper() and uuid_unparse_lower()])
- uuid_ul="`grep -e uuid_unparse_upper -e uuid_unparse_lower
$with_uuid_includes/uuid.h 2>/dev/null`"
- if test -n "$uuid_ul"; then
- AC_DEFINE(HAS_UUID_UNPARSE_CASE, 1, [if uuid_unparse_lower() and
uuid_unparse_upper() are available])
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
-
- # check if C++ compiler can link with UUID libs
- SAVE_CPPFLAGS="$CPPFLAGS"
- SAVE_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $UUID_CPPFLAGS"
- LIBS="$LIBS $UUID_LIBS"
+ if test -n "$uuid_app_libs"; then
+ UUID_LIBS="-L$with_uuid_libs -luuid"
+ elif test "$with_uuid_libs" != "System"; then
+ UUID_LIBS="-luuid"
+ fi
+ fi
+
+ # check for uuid_unparse_upper() and uuid_unparse_lower()
+ AC_MSG_CHECKING([for uuid_unparse_upper() and uuid_unparse_lower()])
+ uuid_ul="`grep -e uuid_unparse_upper -e uuid_unparse_lower
$with_uuid_includes/uuid.h 2>/dev/null`"
+ if test -n "$uuid_ul"; then
+ AC_DEFINE(HAS_UUID_UNPARSE_CASE, 1, [if uuid_unparse_lower() and
uuid_unparse_upper() are available])
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+ # check if C++ compiler can link with UUID libs
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ SAVE_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $UUID_CPPFLAGS"
+ LIBS="$LIBS $UUID_LIBS"
- # see if it's OSSP UUID
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ # see if it's OSSP UUID
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <uuid.h>
+ ]],[[
+uuid_t up; uuid_generate(up);
+ ]])], ossp_uuid=yes, ossp_uuid=no)
+
+ if test "$ossp_uuid" = yes; then
+ UUID_CPPFLAGS="$UUID_CPPFLAGS -DOSSP_UUID=1"
+ else
+ # see if it's OSSP UUID
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <uuid.h>
]],[[
uuid_t *up; uuid_create(&up);
]])], ossp_uuid=yes, ossp_uuid=no)
- if test "$ossp_uuid" = yes; then
- UUID_CPPFLAGS="$UUID_CPPFLAGS -DOSSP_UUID=1"
- else
- # check for UNIX/Ted Ts'o's UUID library
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ if test "$ossp_uuid" = yes; then
+ UUID_CPPFLAGS="$UUID_CPPFLAGS -DOSSP_UUID=1 -DOSSP_UUID_CREATE=1"
+ else
+ # check for UNIX/Ted Ts'o's UUID library
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include <uuid/uuid.h>
]],[[
#ifndef _UUID_STRING_t
@@ -543,18 +553,20 @@
uuid_t uu;
uuid_parse(in, uu);
]])], uuid_links=yes, uuid_links=no)
+ fi
+
+ if test "$uuid_links" = "no"; then
+ AC_MSG_ERROR([could not compile a test libuuid program])
+ fi
+ fi
- CPPFLAGS="$SAVE_CPPFLAGS"
- LIBS="$SAVE_LIBS"
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ LIBS="$SAVE_LIBS"
- if test "$uuid_links" = "no"; then
- AC_MSG_ERROR([could not compile a test libuuid program])
- fi
- fi
- AC_SUBST(UUID_CPPFLAGS)
- AC_SUBST(UUID_LIBS)
- with_uuid=yes
- fi
+ AC_SUBST(UUID_CPPFLAGS)
+ AC_SUBST(UUID_LIBS)
+ with_uuid=yes
+ fi
else
AC_MSG_ERROR([no libuuid libraries or includes found])
fi
@@ -606,7 +618,7 @@
AC_MSG_CHECKING([for qore include files])
# try to find include files
- if test "$a" = "/"; then
+ if test "$a" = "/" -o -z "$a" ; then
inc=/usr/include
else
inc=$a/include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/src/uuid-module.cpp
new/module-uuid-release-1.0.10/src/uuid-module.cpp
--- old/module-uuid-release-0.9.15/src/uuid-module.cpp 2020-12-28
18:17:03.000000000 +0100
+++ new/module-uuid-release-1.0.10/src/uuid-module.cpp 2021-07-31
17:17:10.000000000 +0200
@@ -2,7 +2,7 @@
/*
uuid Qore module
- Copyright (C) 2010 - 2016 David Nichols
+ Copyright (C) 2010 - 2021 David Nichols
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -45,7 +45,7 @@
DLLLOCAL QoreClass* initUUIDClass(QoreNamespace &ns);
-QoreNamespace UNS("UUID");
+QoreNamespace UNS("Qore::UUID");
QoreStringNode *uuid_module_init() {
// setup namespace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/src/uuid-module.h
new/module-uuid-release-1.0.10/src/uuid-module.h
--- old/module-uuid-release-0.9.15/src/uuid-module.h 2020-12-28
18:17:03.000000000 +0100
+++ new/module-uuid-release-1.0.10/src/uuid-module.h 2021-07-31
17:17:10.000000000 +0200
@@ -56,7 +56,7 @@
#ifdef WIN_UUID
typedef UUID q_uuid_t;
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
typedef uuid_t* q_uuid_t;
#else
typedef uuid_t q_uuid_t;
@@ -89,8 +89,8 @@
else
str->tolwr();
#else // WIN_UUID
-#ifdef OSSP_UUID
- char *buf = 0;
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
+ char* buf = nullptr;
size_t len = 0;
#ifdef DEBUG
uuid_rc_t rc = uuid_export(uuid, UUID_FMT_STR, &buf, &len);
@@ -133,7 +133,7 @@
#ifdef WIN_UUID
UuidCreate(&uuid);
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
if (flags & QUF_TIME)
uuid_make(uuid, UUID_MAKE_V1);
else if (!(flags & QUF_EMPTY))
@@ -154,14 +154,22 @@
public:
DLLLOCAL QoreUUID(int flags = QUF_NONE) {
#ifdef OSSP_UUID
+#ifdef OSSP_UUID_CREATE
uuid_create(&uuid);
+#else
+ uuid_generate(uuid);
+#endif
#endif
generateIntern(uuid, flags);
}
DLLLOCAL QoreUUID(const QoreString &uuid_str, ExceptionSink *xsink) {
#ifdef OSSP_UUID
+#ifdef OSSP_UUID_CREATE
uuid_create(&uuid);
+#else
+ uuid_generate(uuid);
+#endif
#endif
set(uuid_str, xsink);
}
@@ -171,7 +179,7 @@
// FIXME: test
memcpy(&uuid, &old.uuid, sizeof(UUID));
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
uuid_create(&uuid);
uuid_clone(old.uuid, &uuid);
#else
@@ -180,7 +188,7 @@
#endif
}
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
DLLLOCAL ~QoreUUID() {
uuid_destroy(uuid);
}
@@ -211,7 +219,7 @@
xsink->raiseException("UUID-STRING-ERROR", getErrorString(xsink,
uuid_str));
return -1;
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
uuid_rc_t rc = uuid_import(uuid, UUID_FMT_STR, uuid_str.getBuffer(),
uuid_str.strlen());
if (rc == UUID_RC_OK)
return 0;
@@ -238,7 +246,7 @@
UuidIsNil((UUID *)&uuid, &rc);
return rc;
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
int result;
uuid_isnil(uuid, &result);
return result;
@@ -252,10 +260,14 @@
#ifdef WIN_UUID
UuidCreateNil(&uuid);
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
uuid_destroy(uuid);
+#ifdef OSSP_UUID_CREATE
uuid_create(&uuid);
#else
+ uuid_generate(uuid);
+#endif
+#else
uuid_clear(uuid);
#endif
#endif
@@ -267,7 +279,7 @@
UuidCompare((UUID*)&uuid, (UUID*)&other.uuid, &rc);
return rc;
#else
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
int result;
uuid_compare(uuid, other.uuid, &result);
return result;
@@ -279,7 +291,7 @@
DLLLOCAL static QoreStringNode *get(int string_flags = QUF_NONE, int
gen_flags = QUF_NONE) {
q_uuid_t uuid;
-#ifdef OSSP_UUID
+#if defined(OSSP_UUID) && defined(OSSP_UUID_CREATE)
uuid_create(&uuid);
#endif
generateIntern(uuid, gen_flags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/module-uuid-release-0.9.15/test/docker_test/test-alpine.sh
new/module-uuid-release-1.0.10/test/docker_test/test-alpine.sh
--- old/module-uuid-release-0.9.15/test/docker_test/test-alpine.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/module-uuid-release-1.0.10/test/docker_test/test-alpine.sh
2021-07-31 17:17:10.000000000 +0200
@@ -0,0 +1,50 @@
+#!/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/uuid-module.cpp" ]; then
+ MODULE_SRC_DIR=$cwd
+ else
+ MODULE_SRC_DIR=$WORKDIR/module-uuid
+ 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}
+gosu qore:qore qore test/uuid-test.q -vv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/module-uuid-release-0.9.15/test/docker_test/test-ubuntu.sh
new/module-uuid-release-1.0.10/test/docker_test/test-ubuntu.sh
--- old/module-uuid-release-0.9.15/test/docker_test/test-ubuntu.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/module-uuid-release-1.0.10/test/docker_test/test-ubuntu.sh
2021-07-31 17:17:10.000000000 +0200
@@ -0,0 +1,46 @@
+#!/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/uuid-module.cpp" ]; then
+ MODULE_SRC_DIR=$cwd
+ else
+ MODULE_SRC_DIR=$WORKDIR/module-uuid
+ fi
+fi
+echo "export MODULE_SRC_DIR=${MODULE_SRC_DIR}" >> ${ENV_FILE}
+
+echo "export QORE_UID=999" >> ${ENV_FILE}
+echo "export QORE_GID=999" >> ${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
+groupadd -o -g ${QORE_GID} qore
+useradd -o -m -d /home/qore -u ${QORE_UID} -g ${QORE_GID} qore
+
+# 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}
+gosu qore:qore qore test/uuid-test.q -vv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/module-uuid-release-0.9.15/test/docker_test/test.sh
new/module-uuid-release-1.0.10/test/docker_test/test.sh
--- old/module-uuid-release-0.9.15/test/docker_test/test.sh 2020-12-28
18:17:03.000000000 +0100
+++ new/module-uuid-release-1.0.10/test/docker_test/test.sh 1970-01-01
01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-ENV_FILE=/tmp/env.sh
-
-. ${ENV_FILE}
-
-# setup MODULE_SRC_DIR env var
-cwd=`pwd`
-if [ "${MODULE_SRC_DIR}" = "" ]; then
- if [ -e "$cwd/src/uuid-module.cpp" ]; then
- MODULE_SRC_DIR=$cwd
- else
- MODULE_SRC_DIR=$WORKDIR/module-uuid
- fi
-fi
-echo "export MODULE_SRC_DIR=${MODULE_SRC_DIR}" >> ${ENV_FILE}
-
-echo "export QORE_UID=999" >> ${ENV_FILE}
-echo "export QORE_GID=999" >> ${ENV_FILE}
-
-. ${ENV_FILE}
-
-export MAKE_JOBS=4
-
-# build module and install
-echo && echo "-- building module --"
-cd ${MODULE_SRC_DIR}
-mkdir build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX}
-make -j${MAKE_JOBS}
-make install
-
-# add Qore user and group
-groupadd -o -g ${QORE_GID} qore
-useradd -o -m -d /home/qore -u ${QORE_UID} -g ${QORE_GID} qore
-
-# 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}
-gosu qore:qore qore test/uuid-test.q -vv
\ No newline at end of file
