Skip to content
Browse files

Integrate fixture into benchmark

  • Loading branch information...
1 parent 18f7887 commit 6a5f8eb648a0f64707463aad1a4c31152fdc5c62 @felixge committed
Showing with 8 additions and 32 deletions.
  1. +7 −2 figures/common.mk
  2. +1 −30 figures/mysql2-vs-new-parser/Makefile
View
9 figures/common.mk
@@ -3,7 +3,7 @@ SHELL := /bin/bash
tsv_files = $(addprefix results/,$(addsuffix .tsv,$(benchmarks)))
png_files = $(subst pdf,png,$(wildcard pdfs/*.pdf))
-all: pdfs pngs results
+all: fixtures results pdfs pngs
$(tsv_files):
./benchmark/run.js "`basename $@ .tsv`" | tee $@
@@ -21,4 +21,9 @@ $(png_files): pngs/%.png: pdfs/%.pdf
clean:
rm -f results/*.tsv pngs/*.png pdfs/*.pdf
-.PHONY: all pdfs pngs results clean
+fixtures: $(fixtures)
+
+$(fixtures):
+ curl -z '$@' -o '$@' "http://felixge.s3.amazonaws.com/12/`basename $@`"
+
+.PHONY: all fixtures pdfs pngs results clean
View
31 figures/mysql2-vs-new-parser/Makefile
@@ -1,33 +1,4 @@
benchmarks = mysql2 new-parser
+fixtures = benchmark/fixtures/100k-blog-rows.mysql
include ../common.mk
-
-
-#SHELL := /bin/bash
-
-#benchmarks = poc mysql2
-#tsv_files = $(addprefix results/,$(addsuffix .tsv,$(benchmarks)))
-#fixtures = benchmark/fixtures/100k-blog-rows.mysql
-#png_files = $(subst pdf,png,$(wildcard pdfs/*.pdf))
-
-#all: pdfs pngs tsvs fixtures
-
-#fixtures: $(fixtures)
-
-#tsvs: $(tsv_files)
-
-#$(tsv_files): results/%.tsv: benchmark/%/run.js
- #./$^ | tee $@
-
-#$(fixtures):
- #curl -z '$@' -o '$@' 'http://felixge.s3.amazonaws.com/12/`basename $@`'
-
-#pdfs: $(tsv_files)
- #cd pdfs && ./generate.r
-
-#pngs: $(png_files)
-
-#$(png_files): pngs/%.png: pdfs/%.pdf
- #convert -density 300 $^ -resize 1024x $@
-
-#.PHONY: all fixtures pdfs pngs tsvs

0 comments on commit 6a5f8eb

Please sign in to comment.
Something went wrong with that request. Please try again.