summaryrefslogtreecommitdiff
path: root/regress/lib/libedit
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2016-09-18 21:06:47 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2016-09-18 21:06:47 +0000
commit405c7c5b1619d1d202b31baaa983ff1e5d7bce6d (patch)
treefeab3888f1c0c97c3019621035f4da7cd2a69624 /regress/lib/libedit
parent283cdefa5c9cf922222c8a47f07fa584d9221d70 (diff)
The libedit regress tests require header files generated during the
build. Add a dependency to run make depend in /usr/src/lib/libedit. Problem found by otto@; OK schwarze@
Diffstat (limited to 'regress/lib/libedit')
-rw-r--r--regress/lib/libedit/chared/Makefile9
-rw-r--r--regress/lib/libedit/keymacro/Makefile9
-rw-r--r--regress/lib/libedit/read/Makefile11
3 files changed, 18 insertions, 11 deletions
diff --git a/regress/lib/libedit/chared/Makefile b/regress/lib/libedit/chared/Makefile
index 75731db563d..3d1e35c6d0e 100644
--- a/regress/lib/libedit/chared/Makefile
+++ b/regress/lib/libedit/chared/Makefile
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2016/04/11 21:15:11 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2016/09/18 21:06:46 bluhm Exp $
#
# Author: Ingo Schwarze <schwarze@openbsd.org>, 2016. Public Domain.
-#
-# Run "cd /usr/src/lib/libedit && make obj && make depend" first.
REGRESS_TARGETS = gets
@@ -12,6 +10,11 @@ CPPFLAGS += -I${.OBJDIR}/../../../../lib/libedit
MAN =
CLEANFILES += out_gets.utf8 out_gets.ascii
+depend:
+ cd ${.CURDIR}/../../../../lib/libedit && make depend
+${PROG}: depend
+regress: ${PROG}
+
gets:
LC_ALL=en_US.UTF-8 ./test_gets < ${.CURDIR}/inp_gets.txt > out_gets.utf8
diff -au ${.CURDIR}/exp_gets.utf8 out_gets.utf8
diff --git a/regress/lib/libedit/keymacro/Makefile b/regress/lib/libedit/keymacro/Makefile
index 6bc05a80b6b..f9e7ff24db8 100644
--- a/regress/lib/libedit/keymacro/Makefile
+++ b/regress/lib/libedit/keymacro/Makefile
@@ -1,12 +1,15 @@
-# $OpenBSD: Makefile,v 1.2 2016/04/11 21:15:11 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2016/09/18 21:06:46 bluhm Exp $
#
# Author: Ingo Schwarze <schwarze@openbsd.org>, 2016. Public Domain.
-#
-# Run "cd /usr/src/lib/libedit && make obj && make depend" first.
PROG = test_get
CPPFLAGS += -I${.CURDIR}/../../../../lib/libedit
CPPFLAGS += -I${.OBJDIR}/../../../../lib/libedit
MAN =
+depend:
+ cd ${.CURDIR}/../../../../lib/libedit && make depend
+${PROG}: depend
+regress: ${PROG}
+
.include <bsd.regress.mk>
diff --git a/regress/lib/libedit/read/Makefile b/regress/lib/libedit/read/Makefile
index 4c0dc7e27cc..416b822a3f9 100644
--- a/regress/lib/libedit/read/Makefile
+++ b/regress/lib/libedit/read/Makefile
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.4 2016/04/11 21:15:11 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2016/09/18 21:06:46 bluhm Exp $
#
# Author: Ingo Schwarze <schwarze@openbsd.org>, 2016. Public Domain.
-#
-# Run "cd /usr/src/lib/libedit && make obj && make depend" first.
REGRESS_TARGETS = getcmd read_char
@@ -10,10 +8,13 @@ CPPFLAGS += -I${.CURDIR}/../../../../lib/libedit
CPPFLAGS += -I${.OBJDIR}/../../../../lib/libedit
CLEANFILES += test_read_char test_getcmd out_getcmd.txt
-read_char: test_read_char
+depend:
+ cd ${.CURDIR}/../../../../lib/libedit && make depend
+
+read_char: depend test_read_char
sh ${.CURDIR}/test_read_char.sh
-getcmd: test_getcmd
+getcmd: depend test_getcmd
echo -n s | ./test_getcmd > out_getcmd.txt
diff -u ${.CURDIR}/exp_getcmd.txt out_getcmd.txt