fanf2 · groleo · Apr 27, 2016 · Apr 27, 2016 · Apr 27, 2016
diff --git a/Makefile b/Makefile
@@ -33,6 +33,7 @@ install: unifdef unifdefall.sh unifdef.1
 clean:
 	rm -f unifdef version.h
 	rm -f tests/*.out tests/*.err tests/*.rc
+	rm -f tests/z_1/*.out tests/z_1/*.err tests/z_1/*.rc
 
 realclean: clean
 	rm -f unifdef.txt

diff --git a/scripts/runtests.sh b/scripts/runtests.sh
@@ -2,7 +2,7 @@
 
 export PATH="$(pwd):${PATH}"
 ${1:+cd} ${1:-:}
-for cmd in *.sh
+for cmd in *.sh z_1/*.sh
 do
 	printf .
 	t=${cmd%.sh}

diff --git a/tests/z_1/000-init.experr b/tests/z_1/000-init.experr
diff --git a/tests/z_1/000-init.expout b/tests/z_1/000-init.expout
diff --git a/tests/z_1/000-init.exprc b/tests/z_1/000-init.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/000-init.sh b/tests/z_1/000-init.sh
@@ -0,0 +1 @@
+unifdef -z1 </dev/null >/dev/null 2>&1 || true
diff --git a/tests/z_1/NetBSD-42628.experr b/tests/z_1/NetBSD-42628.experr
diff --git a/tests/z_1/NetBSD-42628.expout b/tests/z_1/NetBSD-42628.expout
@@ -0,0 +1,6 @@
+#include <net/if_fddi.h>
+
+#include <stdint.h>
+
+
+#include <inttypes.h>
diff --git a/tests/z_1/NetBSD-42628.exprc b/tests/z_1/NetBSD-42628.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/NetBSD-42628.sh b/tests/z_1/NetBSD-42628.sh
@@ -0,0 +1 @@
+unifdef -z1 -U__FreeBSD__ NetBSD-42628.c
diff --git a/tests/z_1/NetBSD-47068.experr b/tests/z_1/NetBSD-47068.experr
diff --git a/tests/z_1/NetBSD-47068.expout b/tests/z_1/NetBSD-47068.expout
@@ -0,0 +1,2 @@
+#ifdef foo
+#endif
diff --git a/tests/z_1/NetBSD-47068.exprc b/tests/z_1/NetBSD-47068.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/NetBSD-47068.sh b/tests/z_1/NetBSD-47068.sh
@@ -0,0 +1 @@
+unifdef -z1 -Ubar NetBSD-47068.c
diff --git a/tests/z_1/args1.experr b/tests/z_1/args1.experr
diff --git a/tests/z_1/args1.expout b/tests/z_1/args1.expout
@@ -0,0 +1,3 @@
+#if defined(DUMMY) || FOO(arg)
+hello
+#endif
diff --git a/tests/z_1/args1.exprc b/tests/z_1/args1.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/args1.sh b/tests/z_1/args1.sh
@@ -0,0 +1 @@
+unifdef -z1 -DFOO=1 -DFOOB=42 -UBAR args1.c
diff --git a/tests/z_1/args2.experr b/tests/z_1/args2.experr
diff --git a/tests/z_1/args2.expout b/tests/z_1/args2.expout
@@ -0,0 +1,3 @@
+#if defined(FOO) || BAR(arg)
+hello
+#endif
diff --git a/tests/z_1/args2.exprc b/tests/z_1/args2.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/args2.sh b/tests/z_1/args2.sh
@@ -0,0 +1 @@
+unifdef -z1 -DFOO=1 -DFOOB=42 -UBAR args2.c
diff --git a/tests/z_1/blank0d.experr b/tests/z_1/blank0d.experr
diff --git a/tests/z_1/blank0d.expout b/tests/z_1/blank0d.expout
@@ -0,0 +1,25 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank0d.exprc b/tests/z_1/blank0d.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/blank0d.sh b/tests/z_1/blank0d.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -DFOO0 blank0d.c
diff --git a/tests/z_1/blank1d.experr b/tests/z_1/blank1d.experr
diff --git a/tests/z_1/blank1d.expout b/tests/z_1/blank1d.expout
@@ -0,0 +1,25 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank1d.exprc b/tests/z_1/blank1d.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/blank1d.sh b/tests/z_1/blank1d.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -DFOO1 blank1d.c
diff --git a/tests/z_1/blank1u.experr b/tests/z_1/blank1u.experr
diff --git a/tests/z_1/blank1u.expout b/tests/z_1/blank1u.expout
@@ -0,0 +1,21 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank1u.exprc b/tests/z_1/blank1u.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/blank1u.sh b/tests/z_1/blank1u.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -UFOO1 blank1u.c
diff --git a/tests/z_1/blank2d.experr b/tests/z_1/blank2d.experr
diff --git a/tests/z_1/blank2d.expout b/tests/z_1/blank2d.expout
@@ -0,0 +1,25 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank2d.exprc b/tests/z_1/blank2d.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/blank2d.sh b/tests/z_1/blank2d.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -DFOO2 blank2d.c
diff --git a/tests/z_1/blank2u.experr b/tests/z_1/blank2u.experr
diff --git a/tests/z_1/blank2u.expout b/tests/z_1/blank2u.expout
@@ -0,0 +1,20 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank2u.exprc b/tests/z_1/blank2u.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/blank2u.sh b/tests/z_1/blank2u.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -UFOO2 blank2u.c
diff --git a/tests/z_1/blank3d.experr b/tests/z_1/blank3d.experr
diff --git a/tests/z_1/blank3d.expout b/tests/z_1/blank3d.expout
@@ -0,0 +1,25 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank3d.exprc b/tests/z_1/blank3d.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/blank3d.sh b/tests/z_1/blank3d.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -DFOO3 blank3d.c
diff --git a/tests/z_1/blank3u.experr b/tests/z_1/blank3u.experr
diff --git a/tests/z_1/blank3u.expout b/tests/z_1/blank3u.expout
@@ -0,0 +1,19 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank3u.exprc b/tests/z_1/blank3u.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/blank3u.sh b/tests/z_1/blank3u.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -UFOO3 blank3u.c
diff --git a/tests/z_1/blank4d.experr b/tests/z_1/blank4d.experr
diff --git a/tests/z_1/blank4d.expout b/tests/z_1/blank4d.expout
@@ -0,0 +1,25 @@
+#ifdef FOO4
+four
+#endif
+
+
+
+
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank4d.exprc b/tests/z_1/blank4d.exprc
@@ -0,0 +1 @@
+0
diff --git a/tests/z_1/blank4d.sh b/tests/z_1/blank4d.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -DFOO4 blank4d.c
diff --git a/tests/z_1/blank4u.experr b/tests/z_1/blank4u.experr
diff --git a/tests/z_1/blank4u.expout b/tests/z_1/blank4u.expout
@@ -0,0 +1,18 @@
+#ifdef FOO3
+three
+#endif
+
+
+
+#ifdef FOO2
+two
+#endif
+
+
+#ifdef FOO1
+one
+#endif
+
+#ifdef FOO0
+zero
+#endif
diff --git a/tests/z_1/blank4u.exprc b/tests/z_1/blank4u.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/blank4u.sh b/tests/z_1/blank4u.sh
@@ -0,0 +1 @@
+unifdef -z1 -B -UFOO4 blank4u.c
diff --git a/tests/z_1/broken2.h b/tests/z_1/broken2.h
@@ -0,0 +1 @@
+#define    /* nothing */
diff --git a/tests/z_1/broken3.h b/tests/z_1/broken3.h
@@ -0,0 +1 @@
+#undef &%^$&%$##@^$
diff --git a/tests/z_1/broken4.h b/tests/z_1/broken4.h
@@ -0,0 +1,2 @@
+#define FOO \
+        bar
diff --git a/tests/z_1/crlf-a.experr b/tests/z_1/crlf-a.experr
diff --git a/tests/z_1/crlf-a.expout b/tests/z_1/crlf-a.expout
@@ -0,0 +1,12 @@
+#if F1
+int f1() { return 0; }
+#endif
+\/
+/\
+comment
+/\
+*\
+comment
+*\
+/\
+eof
diff --git a/tests/z_1/crlf-a.exprc b/tests/z_1/crlf-a.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/crlf-a.sh b/tests/z_1/crlf-a.sh
@@ -0,0 +1 @@
+unifdef -z1 -DF1 crlf.c
diff --git a/tests/z_1/crlf-b.experr b/tests/z_1/crlf-b.experr
diff --git a/tests/z_1/crlf-b.expout b/tests/z_1/crlf-b.expout
@@ -0,0 +1,14 @@
+#if F1
+int f1() { return 0; }
+#else
+int f2() { return 0; }
+#endif
+\/
+/\
+comment
+/\
+*\
+comment
+*\
+/\
+eof
diff --git a/tests/z_1/crlf-b.exprc b/tests/z_1/crlf-b.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/crlf-b.sh b/tests/z_1/crlf-b.sh
@@ -0,0 +1 @@
+unifdef -z1 -DF2 crlf.c
diff --git a/tests/z_1/crlf-c.experr b/tests/z_1/crlf-c.experr
diff --git a/tests/z_1/crlf-c.expout b/tests/z_1/crlf-c.expout
@@ -0,0 +1,16 @@
+#if F1
+int f1() { return 0; }
+#elif F2
+int f2() { return 0; }
+#else
+int f3() { return 0; }
+#endif
+\/
+/\
+comment
+/\
+*\
+comment
+*\
+/\
+eof
diff --git a/tests/z_1/crlf-c.exprc b/tests/z_1/crlf-c.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/crlf-c.sh b/tests/z_1/crlf-c.sh
@@ -0,0 +1 @@
+unifdef -z1 -DF3 crlf.c
diff --git a/tests/z_1/crlf-d.experr b/tests/z_1/crlf-d.experr
diff --git a/tests/z_1/crlf-d.expout b/tests/z_1/crlf-d.expout
@@ -0,0 +1,18 @@
+#if F1
+int f1() { return 0; }
+#elif F2
+int f2() { return 0; }
+#elif F3
+int f3() { return 0; }
+#else
+int f4() { return 0; }
+#endif
+\/
+/\
+comment
+/\
+*\
+comment
+*\
+/\
+eof
diff --git a/tests/z_1/crlf-d.exprc b/tests/z_1/crlf-d.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/crlf-d.sh b/tests/z_1/crlf-d.sh
@@ -0,0 +1 @@
+unifdef -z1 -DF4 crlf.c
diff --git a/tests/z_1/debian-603860.experr b/tests/z_1/debian-603860.experr
diff --git a/tests/z_1/debian-603860.expout b/tests/z_1/debian-603860.expout
@@ -0,0 +1,2 @@
+char foo[] = "rm -rf /*";
+/* baz */
diff --git a/tests/z_1/debian-603860.exprc b/tests/z_1/debian-603860.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/z_1/debian-603860.sh b/tests/z_1/debian-603860.sh
@@ -0,0 +1 @@
+unifdef -z1 -UFOO debian-603860.c
diff --git a/tests/z_1/defundef-broken2.experr b/tests/z_1/defundef-broken2.experr
@@ -0,0 +1,2 @@
+unifdef: broken2.h: 1: Missing macro name in #define
+unifdef: Output may be truncated
diff --git a/tests/z_1/defundef-broken2.expout b/tests/z_1/defundef-broken2.expout
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		unifdef: broken2.h: 1: Missing macro name in #define
		unifdef: Output may be truncated