Skip to content

Commit 9fceea8

Browse files
committed
fix tests
Signed-off-by: Jade Abraham <jade.abraham@hpe.com>
1 parent f4c968c commit 9fceea8

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

test/mason/chplVersion/mason-chpl-version-update.chpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ config const toml = "";
1010

1111
proc main() {
1212

13-
try! updateLock(true, tf=toml);
13+
try {
14+
updateLock(true, tf=toml);
15+
} catch e {
16+
writeln(e.message());
17+
exit(0);
18+
}
1419

1520
if exists("Mason.lock") {
1621
writeln("----- lock file -----");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL)
1+
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL):
22
twoZero-0.1.0 : expecting 999.0.0 or later
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
The following packages are incompatible with your version of Chapel (CHPL_CUR_FULL)
1+
The following packages are incompatible with your version of Chapel (CHPL_CUR_FULL):
22
simpleBadDepA-0.1.0 : expecting 1.0.0
33
simpleBadDepB-0.1.0 : expecting 1.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL)
1+
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL):
22
rangeFailBug-0.1.0 : expecting 1.16.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL)
1+
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL):
22
rangeFailMajor-0.1.0 : expecting 99.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL)
1+
The following package is incompatible with your version of Chapel (CHPL_CUR_FULL):
22
rangeFailMinor-0.1.0 : expecting 1.0.0..1.15.0

test/mason/mason-help-tests/masonHelpTests.good

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ Options:
8282
--example <example> Build an example from the example/ directory
8383
--[no-]update [Do not] update the mason registry before
8484
building
85-
--dependent-modules Print the include paths to the dependent
86-
modules to be integrated into build step
8785

8886
When --example is thrown without an example, all examples will be built
8987
When no options are provided, the following will take place:

test/mason/run-lib-example/mason-run.chpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,5 @@ proc main() {
1111
} catch e {
1212
writeln(e.message());
1313
}
14-
} else if testcase == 2 {
15-
masonRun(["run", "--build", "--force", "--example"]); // should run all examples
1614
}
1715
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
--testcase=0
22
--testcase=1 # mason-run-error
3-
--testcase=2

0 commit comments

Comments
 (0)