Skip to content

Commit

Permalink
Merge pull request #18749 from aconsroe-hpe/fix/jemalloc-env-warning
Browse files Browse the repository at this point in the history
Only warn if CHPL_MEM and CHPL_TARGET_MEM disagree

reviewed by ronawho

This silences the warning that was causing a failed test in
test/compflags/link/sungeun/static_dynamic.skipif because sub_test.py
runSkipIf calls util/test/testEnv which takes the output from
printchplenv --all --internal --simple --no-tidy and sets them in the
environment. Because CHPL_MEM and CHPL_TARGET_MEM both get set by this
script, we were triggering the warning (which anything on stderr will
cause the skipif to fail).

I still think having the warning is a good thing and I think it's
reasonable to only warn when there is a mismatch.
  • Loading branch information
aconsroe-hpe committed Nov 19, 2021
2 parents cac31de + 047dda5 commit 5a8ec12
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion util/chplenv/chpl_mem.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def get(flag='host'):
mem_val = 'cstdlib'
elif chpl_target_mem:
mem_val = chpl_target_mem
if chpl_mem:
if chpl_mem and chpl_target_mem != chpl_mem:
warning("CHPL_MEM and CHPL_TARGET_MEM are both set, "
"taking value from CHPL_TARGET_MEM")
elif chpl_mem:
Expand Down

0 comments on commit 5a8ec12

Please sign in to comment.