From 5c07204351584f0d2048b837f3abd55e11a2b62c Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Sun, 30 Jun 2013 10:21:21 +0200 Subject: [PATCH 1/4] update rakefile for convenient cmake setup --- Rakefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index ccbb0cb9a..6472e9021 100644 --- a/Rakefile +++ b/Rakefile @@ -82,8 +82,12 @@ task :default => [:build] desc "Build using CMake." task :build do - Dir.chdir BUILD_FOLDER do - system "make" + if Dir.exists? BUILD_FOLDER + Dir.chdir BUILD_FOLDER do + system "make" + end + else + system "mkdir build; cd build; cmake ..; make" end end From c9c900b364d9017809643e05dc7530c364c6b3d5 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Sun, 30 Jun 2013 10:37:25 +0200 Subject: [PATCH 2/4] default cucumber profiles doesn't run @todo or @stress tests --- config/cucumber.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cucumber.yml b/config/cucumber.yml index 5a9fa4eaa..1847f0198 100644 --- a/config/cucumber.yml +++ b/config/cucumber.yml @@ -1,5 +1,5 @@ # config/cucumber.yml ##YAML Template --- -default: --require features +default: --require features --tags ~@todo --tag ~@stress verify: --require features --tags ~@todo --tag ~@stress -f progress \ No newline at end of file From 9de5e31a7a2477b367e3d860ff451e1f7b8097fe Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 2 Jul 2013 22:51:21 +0200 Subject: [PATCH 3/4] readding profile.lua --- profile.lua | 1 + 1 file changed, 1 insertion(+) create mode 120000 profile.lua diff --git a/profile.lua b/profile.lua new file mode 120000 index 000000000..bad7e6bb5 --- /dev/null +++ b/profile.lua @@ -0,0 +1 @@ +profiles/car.lua \ No newline at end of file From c3c0c8d881a8ee96b1eb70f03e1dcaed9e41fa2e Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 2 Jul 2013 22:51:52 +0200 Subject: [PATCH 4/4] readding profile.lua --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2e6107ad3..cb2326b04 100644 --- a/.gitignore +++ b/.gitignore @@ -79,4 +79,3 @@ stxxl.errlog /sandbox/ /test/profile.lua -/profile.lua