Skip to content

Fix intel test #169

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

Merged
danielhollas merged 2 commits into from
Dec 12, 2023
Merged

Fix intel test #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a7fe26
Fix Intel OneAPI test?
danielhollas Dec 5, 2023
630ac3e
Fix regex in fprettify
danielhollas Dec 5, 2023
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
2 changes: 1 addition & 1 deletion fprettify/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def split(self, line):
LR_OPS_RE = [REL_OP_RE, LOG_OP_RE, plusminus_parser(PLUSMINUS_RE), MULTDIV_RE, PRINT_RE]

USE_RE = re.compile(
SOL_STR + "USE(\s+|(,.+?)?::\s*)\w+?((,.+?=>.+?)+|,\s*only\s*:.+?)?$" + EOL_STR, RE_FLAGS)
SOL_STR + r"USE(\s+|(,.+?)?::\s*)\w+?((,.+?=>.+?)+|,\s*only\s*:.+?)?$" + EOL_STR, RE_FLAGS)

# markups to deactivate formatter
NO_ALIGN_RE = re.compile(SOL_STR + r"&\s*[^\s*]+")
Expand Down
2 changes: 1 addition & 1 deletion tests/TERAPI-FAILS/ABIN_ERROR4.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ERROR in mpi_wrapper.F90: Message truncated, error stack:
ERROR in mpi_wrapper.F90:
4 changes: 3 additions & 1 deletion tests/TERAPI-FAILS/test4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ function cleanup {
kill -9 $tcpid $abinpid > /dev/null 2>&1 || true
grep 'what()' $TCOUT > TC_ERROR$IDX
if [[ -f ERROR ]];then
mv ERROR ABIN_ERROR$IDX
# NOTE: Different compilers may print different errors here,
# so we strip the actual error and just check that it came from mpi_wrapper.F90
sed -E 's/(ERROR in mpi_wrapper.F90:).*/\1/' ERROR > ABIN_ERROR$IDX
fi
exit 0
}
Expand Down