Skip to content

Commit

Permalink
Test updates for the change in behavior
Browse files Browse the repository at this point in the history
- Makes two additional tests futures since we had to back out the quick fix
- Updates the comments on three tests for the new state of affairs
- Modifies the future for ternaryPlainRef to reflect its new behavior
- Remove execopts for ternaryPlainRef now that it fails more broadly instead of
  just with memory leaks

----
Signed-off-by: Lydia Duncan <[email protected]>
  • Loading branch information
lydia-duncan committed Jul 5, 2024
1 parent f6c199c commit d65f106
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
2 changes: 2 additions & 0 deletions test/types/string/ternaryPlain.future
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bug: strings in ternary expressions will sometimes segfault
#25032
1 change: 0 additions & 1 deletion test/types/string/ternaryPlainRef.execopts

This file was deleted.

6 changes: 2 additions & 4 deletions test/types/string/ternaryPlainRef.future
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
bug: const ref strings in ternary expressions sometimes leak memory
#25417

When this future is resolved, please remove the .execopts file
bug: strings in ternary expressions will sometimes segfault
#25032
6 changes: 3 additions & 3 deletions test/types/string/ternaryReturn.chpl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// This test is to lock in that a bug was resolved involving returning strings
// from nested ternary returns
// This test is to lock in a bug involving returning strings from nested ternary
// returns

// This is the version that originally failed. Please do not modify the return
// statement, to ensure the test continues to lock in the fix
// statement, to ensure the test continues to lock in any future fix
proc positive(z : string) {
param EMPTY = '';
return if z == '~' then ' ' else (if z == '+' then z else EMPTY);
Expand Down
2 changes: 2 additions & 0 deletions test/types/string/ternaryReturn.future
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bug: strings in ternary expressions will sometimes segfault
#25032
4 changes: 2 additions & 2 deletions test/types/string/ternaryReturn2.chpl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// This test is to lock in that a bug was resolved involving returning strings
// This test is to lock in behavior around a bug involving returning strings
// from nested ternary returns

// This is not the version that failed, it was added to ensure that the cases
// that worked before were not broken by the solution
// that worked before are not broken by the solution
proc positive(z : string) {
param EMPTY = '';
const temp = if z == '+' then z else EMPTY;
Expand Down
2 changes: 1 addition & 1 deletion test/types/string/ternaryReturn3.chpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This test is to lock in that a bug was resolved involving returning strings
// This test is to lock in behavior around a bug involving returning strings
// from nested ternary returns

// This is not the version that failed, it was added to ensure that the cases
Expand Down

0 comments on commit d65f106

Please sign in to comment.