From a2b6aa263ecff76247ca039f66430f3bd52dd791 Mon Sep 17 00:00:00 2001 From: Mads Ohm Larsen Date: Sun, 4 Jan 2015 18:25:19 +0100 Subject: [PATCH 1/2] Add local tmp folder --- .gitignore | 2 +- script/test | 4 ++++ test/source/_includes/tmp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d9effd5b..36da9656 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,5 @@ site/_site/ coverage .ruby-version .sass-cache -tmp/stackprof-* +tmp/* .jekyll-metadata diff --git a/script/test b/script/test index 52dc4b92..eddb7f4b 100755 --- a/script/test +++ b/script/test @@ -4,6 +4,10 @@ # script/test # script/test +if [ ! -d tmp ]; then + mkdir tmp +fi + if [ -z "$1" ]; then TEST_FILES="./test/test_*.rb" else diff --git a/test/source/_includes/tmp b/test/source/_includes/tmp index cad23091..a846f50d 120000 --- a/test/source/_includes/tmp +++ b/test/source/_includes/tmp @@ -1 +1 @@ -/tmp \ No newline at end of file +../../../tmp/ \ No newline at end of file From 1062fdf89fb913e8548b5208b499280103f5365d Mon Sep 17 00:00:00 2001 From: Mads Ohm Larsen Date: Sun, 4 Jan 2015 18:25:29 +0100 Subject: [PATCH 2/2] Use local tmp folder for symlink tests --- test/test_tags.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_tags.rb b/test/test_tags.rb index bc4b48cd..bdfae6ea 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -319,7 +319,7 @@ CONTENT context "with symlink'd include" do should "not allow symlink includes" do - File.open("/tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") } + File.open("tmp/pages-test", 'w') { |file| file.write("SYMLINK TEST") } assert_raise IOError do content = <