Skip to content

Commit a8ad7f6

Browse files
delbonisadiabat
authored andcommitted
Minor fixes to get have Hubris build properly with the Jenkinsfile (#374)
* Update Jenkinsfile with new gotests.sh location. * More Jenkinsfile fixes. * Create the "_data" dir needed by the integration tests. * Make building lit-af less verbose. * Changed where we increment the test fail counter.
1 parent 08677e4 commit a8ad7f6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ pipeline {
2323
}
2424
stage('Unit Tests') {
2525
steps {
26-
sh './gotests.sh'
26+
sh './scripts/gotests.sh'
2727
}
2828
}
2929
stage('Integration Tests') {
3030
steps {
31-
sh 'cd test && env LIT_OUTPUT_SHOW=1 ./runtests.sh'
31+
sh 'cd test && env LIT_OUTPUT_SHOW=1 ./runtests.py'
3232
}
3333
}
3434
stage('Package') {

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ lit: goget
1414
@echo "Run \"$(GOBIN)/lit\" to launch lit."
1515

1616
lit-af: goget
17-
build/env.sh go build -v ./cmd/lit-af
17+
build/env.sh go build ./cmd/lit-af
1818
@echo "Run \"$(GOBIN)/lit-af\" to launch lit-af."
1919

2020
webui:

test/runtests.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ def run_test_list(tests):
110110
print('------------------------------')
111111
print('Failure:', name)
112112
print('\nError:', e)
113+
fail += 1
113114
if type(e) is KeyboardInterrupt:
114115
break
115-
fail += 1
116116
# TODO Report failures and why.
117117

118118
print('==============================')
@@ -126,6 +126,7 @@ def run_test_list(tests):
126126
return res
127127

128128
if __name__ == '__main__':
129+
os.makedirs('_data', exist_ok=True)
129130
tests = load_tests_from_file('tests.txt')
130131

131132
# If given arguments, run these instead. Doesn't do them in given order, sadly.

0 commit comments

Comments
 (0)