diff --git a/Makefile b/Makefile index 8a2b95b3..8286bcfb 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/_oasis b/_oasis index 405d3e37..2e97f303 100644 --- a/_oasis +++ b/_oasis @@ -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/