moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

ci/tests: Move CI test result creation above environment setup

Browse Source 
This avoids using our test servers as proxy to the AppVeyor API.

Closes #5022
This commit is contained in:
Marc Hoersken 2020-03-03 12:49:53 +01:00
parent c0d8b96f24
commit 3feb60d289
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/runtests.pl
View File

@ -3358,6 +3358,19 @@ sub singletest {
delete $oldenv{$var}; delete $oldenv{$var};
} }
# get the name of the test early
my @testname= getpart("client", "name");
my $testname = $testname[0];
$testname =~ s/\n//g;
# create test result in CI services
if(azure_check_environment() && $AZURE_RUN_ID) {
$AZURE_RESULT_ID = azure_create_test_result($AZURE_RUN_ID, $testnum, $testname);
}
elsif(appveyor_check_environment()) {
appveyor_create_test_result($testnum, $testname);
}
# remove test server commands file before servers are started/verified # remove test server commands file before servers are started/verified
unlink($FTPDCMD) if(-f $FTPDCMD); unlink($FTPDCMD) if(-f $FTPDCMD);
@ -3517,9 +3530,6 @@ sub singletest {
my $CURLOUT="$LOGDIR/curl$testnum.out"; # curl output if not stdout my $CURLOUT="$LOGDIR/curl$testnum.out"; # curl output if not stdout
# name of the test # name of the test
my @testname= getpart("client", "name");
my $testname = $testname[0];
$testname =~ s/\n//g;
logmsg "[$testname]\n" if(!$short); logmsg "[$testname]\n" if(!$short);
if($listonly) { if($listonly) {
@ -3743,13 +3753,6 @@ sub singletest {
close(GDBCMD); close(GDBCMD);
} }
if(azure_check_environment() && $AZURE_RUN_ID) {
$AZURE_RESULT_ID = azure_create_test_result($AZURE_RUN_ID, $testnum, $testname);
}
elsif(appveyor_check_environment()) {
appveyor_create_test_result($testnum, $testname);
}
# timestamp starting of test command # timestamp starting of test command
$timetoolini{$testnum} = Time::HiRes::time(); $timetoolini{$testnum} = Time::HiRes::time();
@ -5543,6 +5546,7 @@ foreach $testnum (@at) {
my $error = singletest($run_event_based, $testnum, $count, scalar(@at)); my $error = singletest($run_event_based, $testnum, $count, scalar(@at));
# update test result in CI services
if(azure_check_environment() && $AZURE_RUN_ID && $AZURE_RESULT_ID) { if(azure_check_environment() && $AZURE_RUN_ID && $AZURE_RESULT_ID) {
$AZURE_RESULT_ID = azure_update_test_result($AZURE_RUN_ID, $AZURE_RESULT_ID, $testnum, $error, $AZURE_RESULT_ID = azure_update_test_result($AZURE_RUN_ID, $AZURE_RESULT_ID, $testnum, $error,
$timeprepini{$testnum}, $timevrfyend{$testnum}); $timeprepini{$testnum}, $timevrfyend{$testnum});