Skip to content

Commit

Permalink
Update options for nocapture
Browse files Browse the repository at this point in the history
Updated rapidjson & python-rapidjson with fix for segfault w/ numpy 2.0
  • Loading branch information
langmm committed Jun 24, 2024
1 parent f1bba08 commit f72b4b8
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
22 changes: 15 additions & 7 deletions run_yggschema.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ DONT_BUILD=""
WITH_ASAN=""
BUILD_ARGS=""
OUTSIDE_DIR=""
DONT_COMPILE=""

while [[ $# -gt 0 ]]; do
case $1 in
Expand All @@ -24,6 +25,10 @@ while [[ $# -gt 0 ]]; do
OUTSIDE_DIR="TRUE"
shift # past argument with no value
;;
--dont-compile )
DONT_COMPILE="TRUE"
shift # past argument with no value
;;
esac
done

Expand Down Expand Up @@ -57,11 +62,13 @@ if [ -n "$WITH_ASAN" ]; then
fi

if [ ! -n "$DONT_BUILD" ]; then
# yggschema
if [ -n "$WITH_ASAN" ]; then
yggcompile c cpp fortran --with-asan
else
yggcompile c cpp fortran
if [ ! -n "$DONT_COMPILE" ]; then
# yggschema
if [ -n "$WITH_ASAN" ]; then
yggcompile c cpp fortran --with-asan
else
yggcompile c cpp fortran
fi
fi
fi

Expand All @@ -77,12 +84,13 @@ if [ -n "$OUTSIDE_DIR" ]; then
cd ..
PREFIX_PATH="yggdrasil/"
fi
pytest -svx -n0 -p no:rerunfailures tests/languages/test_YggInterface.py
# pytest -svx --ygg-debug ${PREFIX_PATH}tests/test_runner.py::test_run_compilation_opt
# pytest -svx --import-mode importlib tests/drivers/test_ConnectionDriver.py::TestConnectionDriverProcess
# pytest -svx tests/drivers/test_ConnectionDriver.py::TestConnectionDriverProcess
# pytest -svx tests/drivers/test_CompiledModelDriver.py
pytest -svx tests/drivers/test_CompiledModelDriver.py::test_get_alternate_class
pytest -svx tests/drivers/test_CompiledModelDriver.py::test_create_windows_import_gcc
# pytest -svx tests/drivers/test_CompiledModelDriver.py::test_get_alternate_class
# pytest -svx tests/drivers/test_CompiledModelDriver.py::test_create_windows_import_gcc
# pytest -svx --suite=mpi --mpi-script=run_mpi.sh
# pytest -svx --ygg-debug --suite=demos ${PREFIX_PATH}tests/demos/test_fspm2020.py::TestFSPM2020Demo::test_run[plant_v1_cpp]
# pytest -svx tests/communication/transforms/test_TransformBase.py
Expand Down
3 changes: 2 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,8 @@ def do_yggdrasil_mods(opts, dont_exit=False):
# Disable output capture
if options.nocapture or options.second_attempt:
opts.remove('nocapture')
opts += ['--capture=no', '-o', 'log_cli=true']
opts += ['--capture=no', '--log-level=INFO']
# opts += ['--capture=no', '-o', 'log_cli=true']
# MPI script
mpi_nproc = options.mpi_nproc
if options.mpi_nproc > 1:
Expand Down
2 changes: 1 addition & 1 deletion yggdrasil/python-rapidjson
2 changes: 1 addition & 1 deletion yggdrasil/rapidjson

0 comments on commit f72b4b8

Please sign in to comment.