build system stuff

This commit is contained in:
Simon Cruanes 2014-05-23 00:31:59 +02:00
parent 24d1a1c578
commit bfc78e5671
2 changed files with 7 additions and 3 deletions

View file

@ -70,8 +70,12 @@ qtest: qtest-clean build
./qtest_all.native
push-stable: all
git checkout stable && git merge master && oasis setup && \
git commit -a 'oasis'
git checkout stable
git merge master -m 'merge from master'
oasis setup
git commit -a -m 'oasis files'
git push origin
git checkout master
test-all: test qtest

2
_oasis
View file

@ -156,7 +156,7 @@ Executable test_threads
Test all
Command: $run_tests
TestTools: run_tests
Run$: flag(tests) && flag(lwt)
Run$: flag(tests)
Executable run_tests
Path: tests/