diff options
| author | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
| commit | 71099221fc8d0456fb38b1954e9053ec527d43b2 (patch) | |
| tree | 6e0b29ded24837b7e31c1ddcd0df5608c1af199e /lib/kernel/test/inet_res_SUITE_data/run-named | |
| parent | fbf611254ded96a0bbeedb76b895f39958b04edc (diff) | |
| parent | 1be1c1cb15068aed40a30210c8be34f36e38ed66 (diff) | |
| download | otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.gz otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.bz2 otp-71099221fc8d0456fb38b1954e9053ec527d43b2.zip | |
Merge branch 'dev' into major
* dev:
Skip create_big_boot on platforms without crypto
Remove test_server path instead of cwd for clash test
Skip getaddr_v6 test if on the ipv4_only host
Use static port for old solaris versions
Extend time to wait for zone files to be loaded
Allow out of memory exception for max_port checks
Extend slave start timeout for windows tests
Double timeout to make sure debug builds pass
Use now instead of os:timestamp
Increase timeout in scheduler_suspend for slow platforms
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'lib/kernel/test/inet_res_SUITE_data/run-named')
| -rwxr-xr-x | lib/kernel/test/inet_res_SUITE_data/run-named | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/test/inet_res_SUITE_data/run-named b/lib/kernel/test/inet_res_SUITE_data/run-named index b418607d48..7caa3756ef 100755 --- a/lib/kernel/test/inet_res_SUITE_data/run-named +++ b/lib/kernel/test/inet_res_SUITE_data/run-named @@ -2,7 +2,7 @@ ## ## %CopyrightBegin% ## -## Copyright Ericsson AB 2009. All Rights Reserved. +## Copyright Ericsson AB 2009-2011. All Rights Reserved. ## ## The contents of this file are subject to the Erlang Public License, ## Version 1.1, (the "License"); you may not use this file except in @@ -155,7 +155,7 @@ $NAMED $NAMED_FG -c "$CONF_FILE" >"$LOG_FILE" 2>&1 </dev/null & NAMED=$! trap "kill -TERM $NAMED >/dev/null 2>&1; wait $NAMED >/dev/null 2>&1" \ 0 1 2 3 15 -sleep 1 # Give name server time to load its zone files +sleep 2 # Give name server time to load its zone files echo "Running: Enter \`\`quit'' to terminate nameserver[$NAMED]..." while read LINE; do test :"$LINE" = :'quit' && break |