2021-04-17 09:01:49 +02:00
|
|
|
diff '--color=auto' -ruN bitwise-v0.42/Makefile.in bitwise-v0.42_new/Makefile.in
|
srcpkgs/b*: convert patches to -Np1
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 04:18:31 +02:00
|
|
|
--- a/Makefile.in 2021-04-16 17:21:30.000000000 +0200
|
|
|
|
|
+++ b/Makefile.in 2021-04-17 09:36:46.661320033 +0200
|
2021-04-17 09:01:49 +02:00
|
|
|
@@ -518,7 +518,7 @@
|
|
|
|
|
src/misc.c \
|
|
|
|
|
tests/test-shunting-yard.c
|
|
|
|
|
|
|
|
|
|
-tests_test_shunting_yard_LDADD = -lcunit
|
|
|
|
|
+tests_test_shunting_yard_LDADD = -lbcunit
|
|
|
|
|
TESTS = $(check_PROGRAMS)
|
|
|
|
|
all: all-am
|
|
|
|
|
|
|
|
|
|
diff '--color=auto' -ruN bitwise-v0.42/tests/test-shunting-yard.c bitwise-v0.42_new/tests/test-shunting-yard.c
|
srcpkgs/b*: convert patches to -Np1
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 04:18:31 +02:00
|
|
|
--- a/tests/test-shunting-yard.c 2021-04-16 17:17:19.000000000 +0200
|
|
|
|
|
+++ b/tests/test-shunting-yard.c 2021-04-17 09:36:46.660320033 +0200
|
2021-04-17 09:01:49 +02:00
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
|
|
|
|
|
|
#include "../inc/shunting-yard.h"
|
|
|
|
|
|
|
|
|
|
-#include <CUnit/Basic.h>
|
|
|
|
|
+#include <BCUnit/Basic.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
#define ASSERT_RESULT(expression, expected) \
|
