From 019f6281e40e60b4993bb797284348983aca2531 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Tue, 1 Dec 2015 23:06:00 +0900
Subject: [PATCH] Update benchmark suite for CI

---
 .travis.yml                                   | 13 ++++++++-----
 benchmark/{ => etc}/string_interpolation.haml |  0
 bin/bench                                     |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename benchmark/{ => etc}/string_interpolation.haml (100%)

diff --git a/.travis.yml b/.travis.yml
index 43c31ed7..9c0bb3cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,22 +14,25 @@ matrix:
       env: TASK=test
     - rvm: 2.2
       env: TASK=test
-    - rvm: 2.2
-      env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
     - rvm: 2.2
       env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
     - rvm: 2.2
       env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
+    - rvm: 2.2
+      env: TASK=bench SLIM_BENCH=1
     - rvm: 2.2
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
     - rvm: 2.2
-      env: TASK=bench SLIM_BENCH=1
+      env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
+    - rvm: 2.2
+      env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
     - rvm: 2.2
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
-    - env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
     - env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
     - env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
     - env: TASK=bench SLIM_BENCH=1
+    - env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
+    - env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
+    - env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
     - env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
diff --git a/benchmark/string_interpolation.haml b/benchmark/etc/string_interpolation.haml
similarity index 100%
rename from benchmark/string_interpolation.haml
rename to benchmark/etc/string_interpolation.haml
diff --git a/bin/bench b/bin/bench
index 47cc9f91..b7d74433 100755
--- a/bin/bench
+++ b/bin/bench
@@ -15,7 +15,7 @@ class Bench < Thor
   option :compile, type: :boolean, aliases: ['-c']
   option :show_code, type: :boolean, aliases: ['-s']
   def bench(*files)
-    files.each { |file| render(file) unless options[:compile] }
+    files.each { |file| render(file) }
     files.each { |file| compile(file) if options[:compile] }
     files.each { |file| code(file) if options[:show_code] }
   end