From b919f0b0c1946aa6dcf1c4f7ecf05a442f5e8472 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Fri, 23 May 2014 00:31:59 +0200
Subject: [PATCH] build system stuff

---
 Makefile | 8 ++++++--
 _oasis   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8a2b95b3..4b267989 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 '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/