summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2016-02-23 16:12:13 +1100
committerDamien Miller <djm@mindrot.org>2016-02-23 17:40:16 +1100
commit1acc058d0a7913838c830ed998a1a1fb5b7864bf (patch)
tree14ece3b75d64372c430198b0f36a8c0a124a585a /Makefile.in
parent39f303b1f36d934d8410b05625f25c7bcb75db4d (diff)
Disable tests where fs perms are incorrect
Some tests have strict requirements on the filesystem permissions for certain files and directories. This adds a regress/check-perm tool that copies the relevant logic from sshd to exactly test the paths in question. This lets us skip tests when the local filesystem doesn't conform to our expectations rather than continuing and failing the test run. ok dtucker@
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index a8984c8fb..d401787db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -434,6 +434,10 @@ regress/netcat$(EXEEXT): $(srcdir)/regress/netcat.c
434 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ 434 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
435 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 435 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
436 436
437regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c
438 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
439 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
440
437UNITTESTS_TEST_HELPER_OBJS=\ 441UNITTESTS_TEST_HELPER_OBJS=\
438 regress/unittests/test_helper/test_helper.o \ 442 regress/unittests/test_helper/test_helper.o \
439 regress/unittests/test_helper/fuzz.o 443 regress/unittests/test_helper/fuzz.o
@@ -505,6 +509,7 @@ REGRESS_BINARIES=\
505 regress/modpipe$(EXEEXT) \ 509 regress/modpipe$(EXEEXT) \
506 regress/setuid-allowed$(EXEEXT) \ 510 regress/setuid-allowed$(EXEEXT) \
507 regress/netcat$(EXEEXT) \ 511 regress/netcat$(EXEEXT) \
512 regress/check-perm$(EXEEXT) \
508 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ 513 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
509 regress/unittests/sshkey/test_sshkey$(EXEEXT) \ 514 regress/unittests/sshkey/test_sshkey$(EXEEXT) \
510 regress/unittests/bitmap/test_bitmap$(EXEEXT) \ 515 regress/unittests/bitmap/test_bitmap$(EXEEXT) \