utils

commit: a53d2a21217033ee83313803152202a95b90bf18
parent d59ed2b9b6ea4656d1035df2b048618b82b25eb1
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun, 24 Sep 2023 17:12:19 +0200

Remove CRAM

Diffstat:
M
.builds/freebsd.yml
1
-
M
.builds/netbsd.yml
5
++---
M
Makefile
4
+++-
M
README.md
1
-
M
configure
19
-------------------

5 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
@@ -6,7 +6,6 @@ packages:
   - pkgconf
   - kyua
   - gcc
-  - devel/cram
 sources:
   - https://hacktivis.me/git/utils.git
 tasks:
diff --git a/.builds/netbsd.yml b/.builds/netbsd.yml
@@ -6,17 +6,16 @@ packages:
   - pkg-config
   - kyua
   - clang
-# FIXME: cram/prysk on NetBSD, where?
 sources:
   - https://hacktivis.me/git/utils.git
 tasks:
   - clang: |
       cd utils
-      CC=clang CRAM=true ./configure
+      CC=clang ./configure
       DESTDIR=/tmp/clang-destdir make clean test
   - gcc: |
       cd utils
-      CC=gcc CRAM=true ./configure
+      CC=gcc ./configure
       DESTDIR=/tmp/gcc-destdir make clean test
 triggers:
   - action: email
diff --git a/Makefile b/Makefile
@@ -13,11 +13,13 @@ all: $(EXE)
 	rm -f ${<:=.gcov} ${@:=.gcda} ${@:=.gcno}
 	$(CC) -std=c99 $(CFLAGS) -c -o $@ $<
 
+cmd/sizeof32: cmd/sizeof.c
+	$(CC) -std=c99 -m32 $(CFLAGS) -o $@ $< $(LDFLAGS)
+
 .PHONY: test check
 check: test
 test: all
 	MALLOC_CHECK_=3 POSIX_ME_HARDER=1 POSIXLY_CORRECT=1 kyua test || (kyua report --verbose --results-filter=broken,failed; false)
-	MALLOC_CHECK_=3 POSIX_ME_HARDER=1 POSIXLY_CORRECT=1 $(CRAM) test-cmd/*.t
 
 .PHONY: lint
 lint:
diff --git a/README.md b/README.md
@@ -15,7 +15,6 @@ Tested on Linux(musl), FreeBSD, NetBSD, OpenBSD:
 - (optional, test) ATF: <https://github.com/jmmv/atf>
 - (optional, test) Kyua: <https://github.com/jmmv/kyua>
 - (optional, test) bwrap: <https://github.com/containers/bubblewrap/> For safely overlaying false files on the root filesystem
-- (optional, test) [cram](https://bitheap.org/cram) or [prysk](https://www.prysk.net/)
 - (optional, lint) mandoc: <https://mdocml.bsd.lv/> For linting the manual pages
 - (optional, lint) shellcheck: <https://www.shellcheck.net/> For linting `./configure` and shell scripts
 
diff --git a/configure b/configure
@@ -23,7 +23,6 @@ Variables:
   SHELLCHECK=BIN
   FLAWFINDER=BIN
   GCOV=BIN
-  CRAM=BIN
   REUSE=BIN
 
   CFLAGS=OPTIONS
@@ -95,7 +94,6 @@ CFLAGS="${CFLAGS:--g -O2 -DDEBUG}"
 MANDOC="${MANDOC:-mandoc}"
 SHELLCHECK="${SHELLCHECK:-shellcheck}"
 FLAWFINDER="${FLAWFINDER:-flawfinder}"
-CRAM="${CRAM:-cram}"
 REUSE="${REUSE:-reuse}"
 
 # Also allow variables through arguments
@@ -173,22 +171,6 @@ else
 	FLAWFINDER="true"
 fi
 
-if check_cmd CRAM "$CRAM"
-then
-	:
-else
-	echo "Notice: cram not found, trying prysk"
-
-	CRAM="prysk"
-	if check_cmd CRAM "$CRAM"
-	then
-		:
-	else
-		CRAM="false"
-		echo 'Notice: Testsuite depending on cram/psyk disabled'
-	fi
-fi
-
 if check_cmd REUSE "$REUSE"
 then
 	:
@@ -227,7 +209,6 @@ FLAWFINDER = ${FLAWFINDER}
 MSGFMT = ${MSGFMT}
 DBG = ${DBG}
 GCOV = ${GCOV}
-CRAM = ${CRAM}
 REUSE = ${REUSE}
 
 CFLAGS = ${CFLAGS}