Skip to content

Commit 11b3cec

Browse files
committed
Merge remote-tracking branch 'bjoto/rv' into reset
2 parents aa4061e + 16bd51a commit 11b3cec

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

core/tester.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@
1313
from core import Test, PullError
1414

1515

16-
def write_tree_selection_result(result_dir, s, comment):
16+
def write_tree_selection_result(result_dir, s, comment, success=True):
1717
series_dir = os.path.join(result_dir, str(s.id))
1818

1919
tree_test_dir = os.path.join(series_dir, "tree_selection")
2020
if not os.path.exists(tree_test_dir):
2121
os.makedirs(tree_test_dir)
2222

2323
with open(os.path.join(tree_test_dir, "retcode"), "w+") as fp:
24-
fp.write("0")
24+
if success:
25+
fp.write("0")
26+
else:
27+
fp.write("1")
2528
with open(os.path.join(tree_test_dir, "desc"), "w+") as fp:
2629
fp.write(comment)
2730

pw_poller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def _process_series(self, pw_series) -> None:
150150
s.tree_selection_comment = comment
151151
self._workers[s.tree_name].queue.put(s)
152152
else:
153-
core.write_tree_selection_result(self.result_dir, s, comment)
153+
core.write_tree_selection_result(self.result_dir, s, comment, False)
154154
core.mark_done(self.result_dir, s)
155155

156156
self.seen_series.add(s['id'])

tests_rv/patch/build_rv32_defconfig/build_rv32_defconfig.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ tuxmake --wrapper ccache --target-arch riscv --directory . \
1414
if [ $rc -ne 0 ]; then
1515
echo "Build failed" >&$DESC_FD
1616
else
17-
echo "Build and OK" >&$DESC_FD
18-
fi
17+
echo "Build OK" >&$DESC_FD
1918
fi
2019

2120
rm -rf $tmpdir

tests_rv/patch/build_rv64_nommu_k210_defconfig/build_rv64_nommu_k210_defconfig.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ tuxmake --wrapper ccache --target-arch riscv --directory . \
1414
if [ $rc -ne 0 ]; then
1515
echo "Build failed" >&$DESC_FD
1616
else
17-
echo "Build and OK" >&$DESC_FD
18-
fi
17+
echo "Build OK" >&$DESC_FD
1918
fi
2019

2120
rm -rf $tmpdir

tests_rv/patch/build_rv64_nommu_virt_defconfig/build_rv64_nommu_virt_defconfig.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ tuxmake --wrapper ccache --target-arch riscv --directory . \
1414
if [ $rc -ne 0 ]; then
1515
echo "Build failed" >&$DESC_FD
1616
else
17-
echo "Build and OK" >&$DESC_FD
18-
fi
17+
echo "Build OK" >&$DESC_FD
1918
fi
2019

2120
rm -rf $tmpdir

0 commit comments

Comments
 (0)