From bdb0d5b39fb988755410d2a84baedfb512fb5744 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 25 Jun 2023 08:32:50 -0300 Subject: opt/tests/uninclude.sh: Do not dirty the repository To avoid race conditions with the "check-dirty-public" target. --- opt/tests/uninclude.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'opt/tests') diff --git a/opt/tests/uninclude.sh b/opt/tests/uninclude.sh index bb11f05..0a5d41e 100755 --- a/opt/tests/uninclude.sh +++ b/opt/tests/uninclude.sh @@ -1,12 +1,13 @@ #!/bin/sh +set -eu -git restore opt/resources/ +find opt/resources/ -name '*.c' | sed 's/^\(.*\)\.c$/cp \1.c \1.copy/g' | sh # shellcheck disable=2086 -find opt/resources/ -name '*.c' | - sh ~/.usr/bin/uninclude -E '^#include ' -- cc $CFLAGS +find opt/resources/ -name '*.copy' | + uninclude -E '^#include ' -- $CC $CFLAGS -c -find opt/resources/ -name '*.c' | while read -r file; do +find opt/resources/ -name '*.copy' | while read -r file; do if ! cmp -s "$file" "$file".expected; then cat <<-EOF The unincluded file is different from expected. @@ -15,8 +16,6 @@ find opt/resources/ -name '*.c' | while read -r file; do $ diff -U5 $file.expected $file EOF exit 1 - else - git restore "$file" fi done -- cgit v1.2.3