diff options
| -rw-r--r-- | loftix/patching.scm | 6 | ||||
| -rw-r--r-- | patches/e9patch-check-mode.patch | 20 | ||||
| -rw-r--r-- | patches/e9patch-check-rflags.patch | 16 | ||||
| -rw-r--r-- | patches/e9patch-check.patch | 42 |
4 files changed, 42 insertions, 42 deletions
diff --git a/loftix/patching.scm b/loftix/patching.scm index 71d30fa..db3a18c 100644 --- a/loftix/patching.scm +++ b/loftix/patching.scm @@ -30,7 +30,7 @@ #:use-module (guix packages)) (define-public e9patch - (let ((commit "a6d900b997942b124c2cdc9e164500052bbaec17") + (let ((commit "e888f387a1f4650970607d20a1fae5f41940a2c8") (revision "0")) (package (name "e9patch") @@ -42,7 +42,7 @@ (commit commit))) (sha256 (base32 - "03gaf8scsmmfaxsmi5826ixnc5r7j6xaj0bq2fif633s82r7f7cg")) + "0071m238xxdqrc2apq19k0kk7ibzd30b814ih7y26ykqbs2xgqp2")) (file-name (git-file-name name version)) (patches (search-patches ;; https://github.com/GJDuck/e9patch/pull/94 @@ -51,8 +51,6 @@ "patches/e9patch-check.patch" ;; https://github.com/GJDuck/e9patch/pull/95 "patches/e9patch-check-intel-format.patch" - ;; https://github.com/GJDuck/e9patch/pull/88 - "patches/e9patch-check-mode.patch" ;; https://github.com/GJDuck/e9patch/pull/93 "patches/e9patch-check-mov-imm.patch" ;; https://github.com/GJDuck/e9patch/issues/96 diff --git a/patches/e9patch-check-mode.patch b/patches/e9patch-check-mode.patch deleted file mode 100644 index ccbead2..0000000 --- a/patches/e9patch-check-mode.patch +++ /dev/null @@ -1,20 +0,0 @@ -From fdfec33e129efc6c08a0c532c309605c9bb09269 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <cnx@loang.net> -Date: Wed, 13 Nov 2024 19:55:35 +0900 -Subject: [PATCH] Set expected file mode in test to 644 - -For real files, git only distinguish between executable or not, -and the mode of a checked-out file is either 644 or 755. ---- - test/regtest/stat.exp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/regtest/stat.exp b/test/regtest/stat.exp -index 9509b9a..8b78453 100644 ---- a/test/regtest/stat.exp -+++ b/test/regtest/stat.exp -@@ -1,3 +1,3 @@ --mode = 100664 -+mode = 100644 - size = 62 - PASSED diff --git a/patches/e9patch-check-rflags.patch b/patches/e9patch-check-rflags.patch index d012896..596a90f 100644 --- a/patches/e9patch-check-rflags.patch +++ b/patches/e9patch-check-rflags.patch @@ -5,10 +5,16 @@ Date: 2024-12-05 16:00:06 +0900 Disable flaky tests involving rflags diff --git a/test/regtest/Makefile b/test/regtest/Makefile -index 9b29e0f72408..05f9ce0a6591 100644 +index 34bc81bb1da8..cf3618ea4bed 100644 --- a/test/regtest/Makefile +++ b/test/regtest/Makefile -@@ -7,8 +7,14 @@ BASE ::= test test.pie bugs test.libc libtest.so test_c test_c.debug example.so +@@ -1,4 +1,4 @@ +-.PHONY: check clean-check ++.PHONY: check check-flaky clean-check + + E9TOOL ?= ../../e9tool + E9COMPILE ?= ../../e9compile.sh +@@ -12,8 +12,14 @@ BASE ::= test test.pie bugs test.libc libtest.so test_c test_c.debug example.so TRAMPOLINE ::= inst patch dl init fini IN ::= $(wildcard *.in) EXE ::= $(IN:.in=.exe) @@ -24,9 +30,3 @@ index 9b29e0f72408..05f9ce0a6591 100644 ./$^ %.exe: in=$(shell head -1 $<) -@@ -68,4 +74,4 @@ example.so: - clean-check: - rm -f $(BASE) $(TRAMPOLINE) $(EXE) - --.PHONY: check clean-check -+.PHONY: check check-flaky clean-check diff --git a/patches/e9patch-check.patch b/patches/e9patch-check.patch index f679db7..8fb08f6 100644 --- a/patches/e9patch-check.patch +++ b/patches/e9patch-check.patch @@ -42,10 +42,14 @@ index 754f5210b004..272e7bb4866f 100644 +check-debug: debug + $(MAKE) -C test/regtest diff --git a/test/regtest/Makefile b/test/regtest/Makefile -index 992b1bc40984..9b29e0f72408 100644 +index 45272826bb3c..38da5be57dde 100644 --- a/test/regtest/Makefile +++ b/test/regtest/Makefile -@@ -3,32 +3,69 @@ FCF_NONE := $(shell \ +@@ -1,36 +1,72 @@ ++.PHONY: check clean-check ++ + FCF_NONE := $(shell \ + if gcc -fcf-protection=none --version 2>&1 | grep -q 'unrecognized'; \ then true; \ else echo -fcf-protection=none; fi) @@ -112,14 +116,15 @@ index 992b1bc40984..9b29e0f72408 100644 g++ -std=c++11 -fPIC -shared -o example.so -O2 \ ../../examples/plugins/example.cpp -I ../../src/e9tool/ - g++ -std=c++11 -pie -fPIC -o regtest regtest.cpp -O2 +- echo "XXX" > FILE.txt +- chmod 0640 FILE.txt -clean: - rm -f *.log *.out *.exe test test.pie test.libc libtest.so inst inst.o \ - patch patch.o init init.o regtest +clean-check: + rm -f $(BASE) $(TRAMPOLINE) $(EXE) -+ -+.PHONY: check clean-check ++ rm -f *.out diff --git a/test/regtest/README.md b/test/regtest/README.md index be3f6dd664b3..662c2af68a14 100644 --- a/test/regtest/README.md @@ -133,22 +138,28 @@ index be3f6dd664b3..662c2af68a14 100644 - + make E9TOOL_OPTIONS= diff --git a/test/regtest/init_dso.cmd b/test/regtest/init_dso.cmd -index 94f6855c5d60..db31c55672fe 100644 +old mode 100644 +new mode 100755 +index 94f6855c5d60..76ce3fd12f3c --- a/test/regtest/init_dso.cmd +++ b/test/regtest/init_dso.cmd -@@ -1 +1 @@ +@@ -1 +1,2 @@ -LD_PRELOAD=$PWD/init_dso.exe ./test.pie ++#!/bin/sh +LD_PRELOAD=./init_dso.exe ./test.pie diff --git a/test/regtest/init_dso_2.cmd b/test/regtest/init_dso_2.cmd -index d2d56823ff80..d6d59f7b3cfd 100644 +old mode 100644 +new mode 100755 +index d2d56823ff80..8dab0986da87 --- a/test/regtest/init_dso_2.cmd +++ b/test/regtest/init_dso_2.cmd -@@ -1 +1 @@ +@@ -1 +1,2 @@ -LD_PRELOAD=$PWD/init_dso.exe ./test.pie a b c 1 2 3 ++#!/bin/sh +LD_PRELOAD=./init_dso.exe ./test.pie a b c 1 2 3 diff --git a/test/regtest/regtest b/test/regtest/regtest new file mode 100755 -index 000000000000..07d9577b3da4 +index 000000000000..f1d7e67c218f --- /dev/null +++ b/test/regtest/regtest @@ -0,0 +1,32 @@ @@ -162,7 +173,7 @@ index 000000000000..07d9577b3da4 + exp=$tst.exp + + if test -f $cmd -+ then env $(cat $cmd) 1>$out 2>&1 ++ then ./$cmd 1>$out 2>&1 + else ./$exe 1>$out 2>&1 + fi 2>/dev/null + case $? in @@ -459,3 +470,14 @@ index e86e0af03228..000000000000 - return 0; -} - +diff --git a/test/regtest/stat.cmd b/test/regtest/stat.cmd +new file mode 100755 +index 000000000000..badd04fe970b +--- /dev/null ++++ b/test/regtest/stat.cmd +@@ -0,0 +1,5 @@ ++#!/bin/sh ++trap 'rm -f FILE.txt' EXIT HUP INT TERM ++echo XXX > FILE.txt ++chmod 0640 FILE.txt ++./stat.exe |