Skip to content

Commit 0640eb9

Browse files
committed
Several CI fixes
- don't output stdin on terminal - adapt to different google.com ip addresses - cleaner code
1 parent 04c98d9 commit 0640eb9

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

t/12_diff_opensslversions.t

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ die "Unable to open $prg" unless -f $prg;
2525
die "Unable to open $distro_openssl" unless -f $distro_openssl;
2626

2727
# Provide proper start conditions
28-
unlink "tmp.csv";
29-
unlink "tmp2.csv";
28+
unlink $csvfile;
29+
unlink $csvfile2;
3030

3131
#1 run
3232
printf "\n%s\n", "Diff test IPv4 with supplied openssl against \"$uri\"";
33-
@args="$prg $check2run $csvfile $uri 2>&1";
33+
@args="$prg $check2run $csvfile $uri >/dev/null";
3434
system("@args") == 0
3535
or die ("FAILED: \"@args\"");
3636

3737
# 2
3838
printf "\n%s\n", "Diff test IPv4 with $distro_openssl against \"$uri\"";
39-
@args="$prg $check2run $csvfile2 --openssl=$distro_openssl $uri 2>&1";
39+
@args="$prg $check2run $csvfile2 --openssl=$distro_openssl $uri >/dev/null";
4040
system("@args") == 0
4141
or die ("FAILED: \"@args\" ");
4242

@@ -63,6 +63,10 @@ $cat_csvfile =~ s/ECDH\/MLKEM/ECDH 253 /g;
6363
$cat_csvfile =~ s/.nonce-.* //g;
6464
$cat_csvfile2 =~ s/.nonce-.* //g;
6565

66+
+# Fix IP adresses. needed when we don't hit the same IP address. We just remove them
67+
$cat_csvfile =~ s/","google.com\/.*","443/","google.com","443/;
68+
$cat_csvfile2 =~ s/","google.com\/.*","443/","google.com","443/;
69+
6670
$diff = diff \$cat_csvfile, \$cat_csvfile2;
6771

6872
# Compare the differences -- and print them if there were any

t/61_diff_testsslsh.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ my $cat_csv="tmp.csv";
2020
my $check2run="-p -s -P --fs -h -U -c -q --ip=one --color 0 --csvfile $cat_csv";
2121
my $uri="testssl.sh";
2222
my $diff="";
23+
my @args="";
2324

2425
die "Unable to open $prg" unless -f $prg;
2526
die "Unable to open $baseline_csv" unless -f $baseline_csv;
2627

2728
# Provide proper start conditions
2829
unlink $cat_csv;
2930

30-
my @args=("$prg", "$check2run", "$uri", "2>&1");
3131

3232
#1 run
3333
printf "\n%s\n", "Diff unit test (IPv4) against \"$uri\"";
34-
printf "@args\n";
34+
@args="$prg $check2run $uri >/dev/null";
3535
system("@args") == 0
3636
or die ("FAILED: \"@args\" ");
3737

0 commit comments

Comments
 (0)