Kouhei Sutou
null+****@clear*****
Sat Oct 29 00:07:55 JST 2016
Kouhei Sutou 2016-10-29 00:07:55 +0900 (Sat, 29 Oct 2016) New Revision: 8bca79b766c4984145c774627d790e91de4b2ba6 https://github.com/pgroonga/pgroonga/commit/8bca79b766c4984145c774627d790e91de4b2ba6 Message: travis: setup tmp directory by hand Modified files: .travis.yml Makefile Modified: .travis.yml (+2 -2) =================================================================== --- .travis.yml 2016-10-28 23:56:01 +0900 (4dd3904) +++ .travis.yml 2016-10-29 00:07:55 +0900 (a4d9acb) @@ -31,7 +31,7 @@ script: rm -rf sql/function/flush/jsonb.sql rm -rf sql/reindex/analyze.sql fi - - ln -s /tmp ./ - - make installcheck + - sudo -u postgres -H mkdir -p /tmp/space + - make installcheck TMP_DIR=/tmp SETUP_TMP_DIR=no after_failure: - cat regression.diffs Modified: Makefile (+8 -5) =================================================================== --- Makefile 2016-10-28 23:56:01 +0900 (6879675) +++ Makefile 2016-10-29 00:07:55 +0900 (52b6b23) @@ -55,14 +55,17 @@ installcheck: $(RESULT_DIRS) installcheck: $(EXPECTED_DIRS) installcheck: $(EXPECTED_FILES) +TMP_DIR = $(shell pwd)/tmp +SETUP_TMP_DIR = yes prepare-regress: - rm -rf tmp/space - mkdir -p tmp/space - chmod -R 1777 tmp/space - sed -e "s, �� TMP_DIR@,$(PWD)/tmp,g" \ + @if [ $(SETUP_TMP_DIR) = "yes" ]; then \ + rm -rf $(TMP_DIR)/space && \ + mkdir -p $(TMP_DIR)/space; \ + fi + @sed -e "s, �� TMP_DIR@,$(TMP_DIR),g" \ sql/vacuum/tablespace.sql.in > \ sql/vacuum/tablespace.sql - sed -e "s, �� TMP_DIR@,$(PWD)/tmp,g" \ + @sed -e "s, �� TMP_DIR@,$(TMP_DIR),g" \ expected/vacuum/tablespace.out.in > \ expected/vacuum/tablespace.out -------------- next part -------------- HTML����������������������������...Download