Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test blog in a few correctness configs #25871

Merged
merged 5 commits into from
Sep 26, 2024
Merged

Test blog in a few correctness configs #25871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1f7031
add blog testing to gcc112 and llvm16 linux64 tests
arezaii Sep 3, 2024
a4f2029
add blog testing to darwin nightly test
arezaii Sep 3, 2024
25b68e5
add blog to test-darwin config
arezaii Sep 3, 2024
d0aeab7
move variable definition before use
arezaii Sep 3, 2024
22f1a79
allow blog tests to work with examples
arezaii Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions util/cron/nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,11 @@ if ($memleakslog ne "") {
}
}

#
# directory variables
#
$testdir = "$chplhomedir/test";
print "\$chplhomedir = $chplhomedir\n";

$testbindirname = dirname($0);
$utildir = "$testbindirname/../../util";
Expand Down Expand Up @@ -450,11 +455,7 @@ unlink($mysystemlog); # the file gets appended to, so clear it first.
ensureMysystemlogExists($mysystemlog); # empty (vs nonexistent) file is easier to compare against
$prevmysystemlog = "$cronlogdir/last-mysystemerrs-$config_name.txt";

#
# directory variables
#
$testdir = "$chplhomedir/test";
print "\$chplhomedir = $chplhomedir\n";



$launchcmd = "$ENV{'CHPL_TEST_LAUNCHCMD'}";
Expand Down Expand Up @@ -629,7 +630,7 @@ if ($examples == 1) {
$testdirs .= " release/examples";
}

if ($blogonly == 1) {
if ($blogonly == 1 || ($testblog == 1 && $examples == 1)) {
riftEmber marked this conversation as resolved.
Show resolved Hide resolved
# test the sub-directories explicitly to avoid a bunch of skipped directories,
# and also avoid the problem of testing the archetypes directory
$testdirs .= " $blogdir/chpl-src/ $blogdir/content/posts";
Expand Down
2 changes: 1 addition & 1 deletion util/cron/test-darwin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ source $CWD/common-darwin.bash

export CHPL_NIGHTLY_TEST_CONFIG_NAME="darwin"

$CWD/nightly -cron -examples
$CWD/nightly -cron -examples -blog
2 changes: 1 addition & 1 deletion util/cron/test-linux64-clang.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ export CHPL_TARGET_COMPILER=clang

export CHPL_NIGHTLY_TEST_CONFIG_NAME="linux64-clang"

$CWD/nightly -cron -examples ${nightly_args}
$CWD/nightly -cron -examples -blog ${nightly_args}
2 changes: 1 addition & 1 deletion util/cron/test-linux64-gcc112.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ fi

export CHPL_NIGHTLY_TEST_CONFIG_NAME="linux64-gcc112"

$CWD/nightly -cron -examples ${nightly_args}
$CWD/nightly -cron -examples -blog ${nightly_args}
2 changes: 1 addition & 1 deletion util/cron/test-linux64-llvm16.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ fi

export CHPL_NIGHTLY_TEST_CONFIG_NAME="linux64-llvm16"

$CWD/nightly -cron -examples ${nightly_args}
$CWD/nightly -cron -examples -blog ${nightly_args}