Skip to content

Commit

Permalink
Make 'make check' not depend on working dir.
Browse files Browse the repository at this point in the history
Running make check from the top level didn't work.

Demonstrated by: travis-ci.
  • Loading branch information
Lasse Karstensen committed Mar 13, 2016
1 parent a008bf5 commit 9265839
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ endif
EXTRA_DIST = tests

AM_TESTS_ENVIRONMENT = \
TESTDIR=$(abs_top_builddir)/src/tests; export TESTDIR; \
TESTDIR=$(abs_top_builddir)/src/tests/; export TESTDIR; \
PATH=$(abs_top_builddir)/src:$$PATH; export PATH;

TESTS = tests/test01-start-and-stop \
Expand Down
15 changes: 0 additions & 15 deletions src/tests/runtests

This file was deleted.

2 changes: 1 addition & 1 deletion src/tests/test02-simple-request
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Test basic argument handling.
# This implements T2 in the original test plan.

. common.sh
. ${TESTDIR}common.sh
set -o errexit

hitch $HITCH_ARGS --backend=[hitch-tls.org]:80 "--frontend=[${LISTENADDR}]:$LISTENPORT" certs/site1.example.com
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test03-multiple-listen
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Test multiple listening sockets.
#
# This implements T3 in the original test plan.
. common.sh
. ${TESTDIR}common.sh

PORT2=$(($RANDOM + 1024))

Expand Down
2 changes: 1 addition & 1 deletion src/tests/test04-listen-with-own-certs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# This implements T3 in the original test plan.

. common.sh
. ${TESTDIR}common.sh

PORT2=$(($RANDOM + 1024))

Expand Down
2 changes: 1 addition & 1 deletion src/tests/test05-multiple-listen-SNI
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# This implements T4 in the original test plan.

. common.sh
. ${TESTDIR}common.sh

#PORT2=$(($RANDOM + 1024))

Expand Down
2 changes: 1 addition & 1 deletion src/tests/test06-ticket-resume
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Test resuming a session via a session ticket

. common.sh
. ${TESTDIR}common.sh
set +o errexit

sessfile=$(mktemp)
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test07-nomatch-abort
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Test --sni-nomatch-abort
#
. common.sh
. ${TESTDIR}common.sh
set +o errexit

#PORT2=$(($RANDOM + 1024))
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test08-test-configs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/bash
# Test configuration parser.
. common.sh
. ${TESTDIR}common.sh
set +o errexit

hitch --test --config=configs/default.cfg certs/default.example.com 2>/dev/null 1>&2
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test09-wildcard-cert
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/bash

. common.sh
. ${TESTDIR}common.sh
set +o errexit

hitch $HITCH_ARGS --backend=[hitch-tls.org]:80 "--frontend=[${LISTENADDR}]:$LISTENPORT" certs/wildcard.example.com certs/default.example.com
Expand Down
3 changes: 1 addition & 2 deletions src/tests/test10-dflt-certs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#/bin/bash
#
#
#
. common.sh
. ${TESTDIR}common.sh
set +o errexit

PORT1=$(($RANDOM + 1024))
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test11-cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/bash

. common.sh
. ${TESTDIR}common.sh
set +o errexit


Expand Down
3 changes: 1 addition & 2 deletions src/tests/test12-cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#/bin/bash

. common.sh
. ${TESTDIR}common.sh
set +o errexit


mk_cfg <<EOF
backend = "[hitch-tls.org]:80"
frontend = {
Expand Down

0 comments on commit 9265839

Please sign in to comment.