Skip to content

Commit

Permalink
Minor fixes to get have Hubris build properly with the Jenkinsfile (#374
Browse files Browse the repository at this point in the history
)

* 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.
  • Loading branch information
delbonis authored and adiabat committed Sep 20, 2018
1 parent 08677e4 commit a8ad7f6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Expand Up @@ -23,12 +23,12 @@ pipeline {
}
stage('Unit Tests') {
steps {
sh './gotests.sh'
sh './scripts/gotests.sh'
}
}
stage('Integration Tests') {
steps {
sh 'cd test && env LIT_OUTPUT_SHOW=1 ./runtests.sh'
sh 'cd test && env LIT_OUTPUT_SHOW=1 ./runtests.py'
}
}
stage('Package') {
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -14,7 +14,7 @@ lit: goget
@echo "Run \"$(GOBIN)/lit\" to launch lit."

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

webui:
Expand Down
3 changes: 2 additions & 1 deletion test/runtests.py
Expand Up @@ -110,9 +110,9 @@ def run_test_list(tests):
print('------------------------------')
print('Failure:', name)
print('\nError:', e)
fail += 1
if type(e) is KeyboardInterrupt:
break
fail += 1
# TODO Report failures and why.

print('==============================')
Expand All @@ -126,6 +126,7 @@ def run_test_list(tests):
return res

if __name__ == '__main__':
os.makedirs('_data', exist_ok=True)
tests = load_tests_from_file('tests.txt')

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

0 comments on commit a8ad7f6

Please sign in to comment.