CVS commit: pkgsrc/textproc/ada-prettier-ada-25

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Fri Oct  3 18:14:19 UTC 2025

Modified Files:
        pkgsrc/textproc/ada-prettier-ada-25: Makefile distinfo
        pkgsrc/textproc/ada-prettier-ada-25/patches: patch-Makefile
Added Files:
        pkgsrc/textproc/ada-prettier-ada-25/patches:
            patch-testsuite_drivers_base__driver.py

Log Message:
ada-prettier-ada-25: add test support


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ada-prettier-ada-25/Makefile \
    pkgsrc/textproc/ada-prettier-ada-25/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/ada-prettier-ada-25/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/ada-prettier-ada-25/patches/patch-testsuite_drivers_base__driver.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ada-prettier-ada-25/Makefile
diff -u pkgsrc/textproc/ada-prettier-ada-25/Makefile:1.1 pkgsrc/textproc/ada-prettier-ada-25/Makefile:1.2
--- pkgsrc/textproc/ada-prettier-ada-25/Makefile:1.1    Mon Jul 28 11:40:31 2025
+++ pkgsrc/textproc/ada-prettier-ada-25/Makefile        Fri Oct  3 18:14:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/07/28 11:40:31 dkazankov Exp $
+# $NetBSD: Makefile,v 1.2 2025/10/03 18:14:18 dkazankov Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${GITHUB_PROJECT}-${GNAT_NAME}-25.0.0
@@ -39,6 +39,17 @@ INSTALL_TARGET=                              install
 
 MAKE_FLAGS+=                           PREFIX=${DESTDIR}${GNAT_PREFIX} BUILD_MODE=prod
 
+.if ${PKGSRC_RUN_TEST:tl} == "yes"
+.include "../../lang/python/tool.mk"
+.endif
+
+TEST_TARGET=   test
+
+TEST_MAKE_FLAGS+=      PYTHON=${TOOL_PYTHONBIN} GPR_PROJECT_PATH=${WRKSRC}
+
+TEST_DEPENDS+= ${PYPKGPREFIX}-e3-core>=22.6.0:../../devel/py-e3-core
+TEST_DEPENDS+= ${PYPKGPREFIX}-e3-testsuite>=25.0:../../devel/py-e3-testsuite
+
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} ${GNAT_PKGBASE} \( -type f -or -type l \) -print | ${SORT};
Index: pkgsrc/textproc/ada-prettier-ada-25/distinfo
diff -u pkgsrc/textproc/ada-prettier-ada-25/distinfo:1.1 pkgsrc/textproc/ada-prettier-ada-25/distinfo:1.2
--- pkgsrc/textproc/ada-prettier-ada-25/distinfo:1.1    Mon Jul 28 11:40:31 2025
+++ pkgsrc/textproc/ada-prettier-ada-25/distinfo        Fri Oct  3 18:14:18 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2025/07/28 11:40:31 dkazankov Exp $
+$NetBSD: distinfo,v 1.2 2025/10/03 18:14:18 dkazankov Exp $
 
 BLAKE2s (prettier-ada-25.0.0.tar.gz) = cfa22b6a5009c42606a845e54ba3d66b83b0770e860f1f14fb78e53c46fc9ad4
 SHA512 (prettier-ada-25.0.0.tar.gz) = 5e31bedf76f6051a1e40a298953d9aa269f24d374b619fba1de934d4b85efc358532d9d695084b41607ae7d8d87bf91f27a151760c1f010782b2af3f64783c6a
 Size (prettier-ada-25.0.0.tar.gz) = 60082 bytes
-SHA1 (patch-Makefile) = 52f186647c58f46a7a23de4afa60ef073bceadf8
+SHA1 (patch-Makefile) = d7d231f348a6ac9e8d2602d276080d35359e603e
+SHA1 (patch-testsuite_drivers_base__driver.py) = eda69ff33c851f6b235d6f09126d718326d02b22

Index: pkgsrc/textproc/ada-prettier-ada-25/patches/patch-Makefile
diff -u pkgsrc/textproc/ada-prettier-ada-25/patches/patch-Makefile:1.1 pkgsrc/textproc/ada-prettier-ada-25/patches/patch-Makefile:1.2
--- pkgsrc/textproc/ada-prettier-ada-25/patches/patch-Makefile:1.1      Mon Jul 28 11:40:31 2025
+++ pkgsrc/textproc/ada-prettier-ada-25/patches/patch-Makefile  Fri Oct  3 18:14:19 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile,v 1.1 2025/07/28 11:40:31 dkazankov Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/10/03 18:14:19 dkazankov Exp $
 
 Provide gprbuild options
+Run testsuite in WRKDIR instead of /tmp
 
---- Makefile.orig      2024-07-05 12:40:15.000000000 +0300
+--- Makefile.orig      2024-10-07 18:46:25.000000000 +0300
 +++ Makefile
-@@ -1,6 +1,7 @@
+@@ -1,12 +1,14 @@
  BUILD_MODE ?= dev
  LIBRARY_TYPE ?= relocatable
  PROCESSORS ?= 0
@@ -12,7 +13,14 @@ Provide gprbuild options
  
  ALL_LIBRARY_TYPES = static static-pic relocatable
  
-@@ -17,8 +18,7 @@
+ LIB_PROJECT = prettier_ada.gpr
+ 
+ TEST_PROGRAMS = testsuite/test_programs/test_programs.gpr
++TESTSUITE_DIR := $(shell pwd)/testsuite
+ 
+ .PHONY: lib
+ lib:
+@@ -17,8 +19,7 @@
                -XPRETTIER_ADA_LIBRARY_TYPE=$(LIBRARY_TYPE) \
                -XPRETTIER_ADA_BUILD_MODE=$(BUILD_MODE) \
                -P $(LIB_PROJECT) \
@@ -22,7 +30,7 @@ Provide gprbuild options
  
  .PHONY: all
  all:
-@@ -30,8 +30,7 @@
+@@ -30,8 +31,7 @@
                        -XLIBRARY_TYPE=$$library_type \
                        -XPRETTIER_ADA_BUILD_MODE=$(BUILD_MODE) \
                        -P $(LIB_PROJECT) \
@@ -32,3 +40,11 @@ Provide gprbuild options
        done;
  
  .PHONY: clean
+@@ -96,4 +96,6 @@
+ 
+ .PHONY: test
+ test: test-programs
+-      python3 testsuite/testsuite.py
++      TEST_PROGRAMS=$(TESTSUITE_DIR)/test_programs/bin python3 testsuite/testsuite.py \
++          -t $(TESTSUITE_DIR)/temp -d $(TESTSUITE_DIR)/dest -o $(TESTSUITE_DIR)/out \
++          --no-random-temp-subdir --cleanup-mode all --show-error-output

Added files:

Index: pkgsrc/textproc/ada-prettier-ada-25/patches/patch-testsuite_drivers_base__driver.py
diff -u /dev/null pkgsrc/textproc/ada-prettier-ada-25/patches/patch-testsuite_drivers_base__driver.py:1.1
--- /dev/null   Fri Oct  3 18:14:19 2025
+++ pkgsrc/textproc/ada-prettier-ada-25/patches/patch-testsuite_drivers_base__driver.py Fri Oct  3 18:14:19 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-testsuite_drivers_base__driver.py,v 1.1 2025/10/03 18:14:19 dkazankov Exp $
+
+Fix test programs path
+
+--- testsuite/drivers/base_driver.py.orig      2024-10-07 18:46:25.000000000 +0300
++++ testsuite/drivers/base_driver.py
+@@ -36,6 +36,8 @@
+         If the Valgrind mode is enabled, wrap the given command line to run it
+         under Valgrind.
+         """
++        test_programs = os.environ.get('TEST_PROGRAMS', '')
++        args[0] = os.path.join(test_programs, args[0])
+         if self.env.valgrind:
+             filename = self.working_dir(
+                 f"valgrind-report-{len(self.valgrind_log_files)}.txt"