diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2005-02-07 21:38:19 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2005-02-07 21:38:19 +0000 |
| commit | 945f7660b93b4e53f054e36ae99d71477eb66b89 (patch) | |
| tree | c58c72382f7b8b4bab9ad6cb1321426381f1ec45 | |
| parent | 32fcea2ce902263156c4a728421c97a8450d32a0 (diff) | |
| download | ATCD-945f7660b93b4e53f054e36ae99d71477eb66b89.tar.gz | |
ChangeLogTag: Mon Feb 7 21:36:37 2005 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | tests/run_test.pl | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index c7ec1c47a6f..e22548103fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 7 21:36:37 2005 Martin Corino <mcorino@remedy.nl> + + * tests/run_test.pl: + + Some improvements for autobuild testruns on VxWorks. + Mon Feb 7 15:19:40 2005 Phil Mesnier <mesnier_p@ociweb.com> * bin/tao_orb_tests.lst: diff --git a/tests/run_test.pl b/tests/run_test.pl index 4cce7ef481c..b8a6d0d82cb 100755 --- a/tests/run_test.pl +++ b/tests/run_test.pl @@ -198,7 +198,7 @@ sub run_vxworks_command ($) " shParse \"ld 1,0,\\\"\$fname\\\"\"\n" . " set procId [shParse { taskSpawn 0,100,0x0008,64000,ace_main }]\n" . " while { [shParse \"taskIdFigure \$procId\"] != -1 } {\n" . - " shParse { taskDelay (sysClkRateGet ()) }\n" . + " shParse { taskDelay (13 * sysClkRateGet ()) }\n" . " }\n" . " shParse \"unld \\\"\$fname\\\"\"\n" . "}\n" . @@ -234,13 +234,16 @@ sub run_vxworks_command ($) ### Check for problems - if ($status == -1) { - print STDERR "Error: $program FAILED (time out)\n"; - $P->Kill (); - $P->TimedWait (1); + if ($status == -1 || $config_list->check_config ('VX_TGT_REBOOT')) { + if ($status == -1) { + print STDERR "Error: $program FAILED (time out)\n"; + $P->Kill (); + $P->TimedWait (1); + } ## reboot VxWorks kernel to cleanup leftover module $P = new PerlACE::Process ($WINDSH, "-e \"shParse {reboot}; shParse{exit}\" " . $ENV{"ACE_RUN_VX_TGTSVR"}); $P->SpawnWaitKill (60); + sleep(90); $set_vx_defgw = 1; } @@ -557,9 +560,9 @@ if (defined $opt_v && defined $opt_o) { print $oh "?\n" . "proc aceRunTest {fname} {\n" . " shParse \"ld 1,0,\\\"\$fname\\\"\"\n" . - " set procId [shParse { taskSpawn 0,100,0,50000,ace_main }]\n" . + " set procId [shParse { taskSpawn 0,100,0x0008,64000,ace_main }]\n" . " while { [shParse \"taskIdFigure \$procId\"] != -1 } {\n" . - " shParse { taskDelay (sysClkRateGet ()) }\n" . + " shParse { taskDelay (13 * sysClkRateGet ()) }\n" . " }\n" . " shParse \"unld \\\"\$fname\\\"\"\n" . "}\n" . |