mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
tests: auto-set LIB_HTTPD_PORT from test name
We set the default apache port for each of the httpd tests to the 4-digit test number of the test script. We want these to remain unique so that the tests do not conflict with each other when run in parallel. Instead of doing it manually in each test script, let's just set it from the test name at run time. This is simpler, and is one less thing to be updated when test scripts are renamed (e.g., when being re-rolled or when conflicting after being merged with another topic). Incidentally, this fixes a case where t5537 and t5538 used the same port number (5537), and could conflict with each other when run in parallel. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
be961c292f
commit
3bb486e439
|
@ -64,7 +64,7 @@ case $(uname) in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
|
LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'8111'}
|
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-${this_test#t}}
|
||||||
|
|
||||||
TEST_PATH="$TEST_DIRECTORY"/lib-httpd
|
TEST_PATH="$TEST_DIRECTORY"/lib-httpd
|
||||||
HTTPD_ROOT_PATH="$PWD"/httpd
|
HTTPD_ROOT_PATH="$PWD"/httpd
|
||||||
|
|
|
@ -178,7 +178,6 @@ if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then
|
||||||
test_done
|
test_done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5537'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,6 @@ if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then
|
||||||
test_done
|
test_done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5537'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIB_HTTPD_DAV=t
|
LIB_HTTPD_DAV=t
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5540'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
ROOT_PATH="$PWD"
|
ROOT_PATH="$PWD"
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
|
@ -12,7 +12,6 @@ if test -n "$NO_CURL"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ROOT_PATH="$PWD"
|
ROOT_PATH="$PWD"
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
. "$TEST_DIRECTORY"/lib-terminal.sh
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
|
@ -8,7 +8,6 @@ if test -n "$NO_CURL"; then
|
||||||
test_done
|
test_done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@ if test -n "$NO_CURL"; then
|
||||||
test_done
|
test_done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5551'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@ if test -n "$NO_CURL"; then
|
||||||
test_done
|
test_done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5561'}
|
|
||||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||||
start_httpd
|
start_httpd
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue