updated to 1.0.5, fixed test

Author: davidnich

CMakeLists.txt

@@ -8,7 +8,7 @@ option(USE_INTERNAL_BOOST "Enforce using internal copy of boost libraries" OFF)
 
 set (VERSION_MAJOR 1)
 set (VERSION_MINOR 0)
-set (VERSION_PATCH 4)
+set (VERSION_PATCH 5)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )

qore-process-module.spec

@@ -13,22 +13,10 @@
 # get *suse release minor version without trailing zeros
 %define os_min %(echo %suse_version|rev|cut -b-2|rev|sed s/0*$//)
 
-%if %suse_version > 1010
+%if %suse_version
 %define dist .opensuse%{os_maj}_%{os_min}
-%else
-%define dist .suse%{os_maj}_%{os_min}
-%endif
-
-%endif
 %endif
 
-# see if we can determine the distribution type
-%if 0%{!?dist:1}
-%define rh_dist %(if [ -f /etc/redhat-release ];then cat /etc/redhat-release|sed "s/[^0-9.]*//"|cut -f1 -d.;fi)
-%if 0%{?rh_dist}
-%define dist .rhel%{rh_dist}
-%else
-%define dist .unknown
 %endif
 %endif
 
@@ -44,32 +32,29 @@
 
 Summary: process module for Qore
 Name: qore-process-module
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{dist}
-%if 0%{?suse_version}
-License: LGPL-2.0+ or GPL-2.0+ or MIT
-%else
-License: LGPLv2+ or GPLv2+ or MIT
-%endif
-Group: Development/Languages
+License: LGPL-2.1-or-later
+Group: Development/Languages/Other
 URL: http://www.qore.org
 Source: https://github.com/qorelanguage/module-process/releases/download/release-%{version}/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: /usr/bin/env
 Requires: qore-module-api-%{module_api}
-BuildRequires: cmake >= 3.12.4
+BuildRequires: cmake >= 3.5
 BuildRequires: gcc-c++
-BuildRequires: qore-devel >= 1.0
-BuildRequires: qore >= 1.0
+BuildRequires: qore-devel >= 1.12.4
+BuildRequires: qore-stdlib >= 1.12.4
+BuildRequires: qore >= 1.12.4
 BuildRequires: openssl-devel
+BuildRequires: doxygen
 %if 0%{?el7}
 BuildRequires:  devtoolset-7-gcc-c++
 %endif
 
 %description
 process API module for the Qore Programming Language.
 
-
 %if 0%{?suse_version}
 %debug_package
 %endif
@@ -82,16 +67,18 @@ process API module for the Qore Programming Language.
 # enable devtoolset7
 . /opt/rh/devtoolset-7/enable
 %endif
-#%cmake -DCPPFLAGS=-I../3rd_party
-#%cmake_build
 export CXXFLAGS="%{?optflags}"
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DCMAKE_SKIP_RPATH=1 -DCMAKE_SKIP_INSTALL_RPATH=1 -DCMAKE_SKIP_BUILD_RPATH=1 -DCMAKE_PREFIX_PATH=${_prefix}/lib64/cmake/Qore .
 make %{?_smp_mflags}
+make %{?_smp_mflags} docs
+sed -i 's/#!\/usr\/bin\/env qore/#!\/usr\/bin\/qore/' test/*.qtest
 
 %install
-#%cmake_install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
+%check
+qore -l ./process-api-1.3.qmod test/process.qtest -v
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,7 +87,22 @@ rm -rf $RPM_BUILD_ROOT
 %{module_dir}
 %doc COPYING README test/process.qtest test/test_cwd.q test/test_env.q test/test_false.q test/test_io.q test/test_output.q test/test_sleep.q test/test_true.q test/test_utf8.q
 
+%package doc
+Summary: Documentation and examples for the Qore process module
+Group: Development/Languages/Other
+
+%description doc
+This package contains the HTML documentation and example programs for the Qore
+process module.
+
+%files doc
+%defattr(-,root,root,-)
+%doc docs/process test
+
 %changelog
+* Mon Dec 19 2022 David Nichols <david.nichols@qoretechnologies.com>
+- updated to version 1.0.5
+
 * Mon Jan 10 2022 David Nichols <david.nichols@qoretechnologies.com>
 - updated to version 1.0.4
 

src/process.qpp

@@ -53,6 +53,9 @@ Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)
 
     @section process_relnotes Process Module Release History
 
+    @subsection process_v1_0_5 process v1.0.5
+    - Updated to build with \c qpp from %Qore 1.12.4+
+
     @subsection process_v1_0_4 process v1.0.4
     - added missing exception handling to @ref Qore::Process::Process::constructor() "Process::constructor()" to avoid
       a crash due to unhandled C++ exceptions due to resource errors starting processes

test/process.qtest

@@ -526,19 +526,12 @@ public class Main inherits QUnit::Test {
             );
         }
 
-        try {
-            hash<auto> opts = {
-                "path": (m_prefix,),
-                "on_success": sub (int i) {},
-            };
-            Process p(getTestValue("testTrue"), opts);
-        } catch (hash<ExceptionInfo> ex) {
-            assertEq("RUNTIME-TYPE-ERROR", ex.err, "on_success using code with no hash as arg: err");
-            assertEq("parameter 1 ('i') expects type 'int', but got type 'hash' instead",
-                ex.desc,
-                "on_success using code with no hash as arg: desc"
-            );
-        }
+        hash<auto> opts = {
+            "path": (m_prefix,),
+            "on_success": sub (int i) {},
+        };
+        assertThrows("RUNTIME-TYPE-ERROR", "parameter 1 \\('i'\\) expects type 'int', but got type 'hash<auto>' "
+            "instead", sub () { Process p(getTestValue("testTrue"), opts); });
     }
 
     threadTest() {