Merge branch 'master' of https://github.com/gvansickle/ucg

* 'master' of https://github.com/gvansickle/ucg:
  Moved boost test corpus location to be a sibling dir of linux.

.travis.yml

@@ -86,8 +86,7 @@ script:
  - make distcheck 'TESTSUITEFLAGS=--keywords=!benchmark,!characterize'
 
 after_success:
- - cd ../../ && wget http://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.bz2
- - tar xjf boost_1_58_0.tar.bz2
+ - mkdir TestCorpus && cd ../../TestCorpus && wget http://downloads.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.tar.bz2 && tar xjf boost_1_58_0.tar.bz2
  - cd ucg/build
  - make check #TESTSUITEFLAGS='-v -d -x'
  - cat tests/testsuite.log

tests/performance_tests.at

@@ -49,7 +49,7 @@
 ## We generate this file.
 m4_define([UCG_TEST_FILE_NAME_LARGE_FILE_1], ["${builddir}/500MBLoremIpsum.cpp"])
 ## The Boost library, version 1.58.0, as unpacked from the tarball.
-m4_define([UCG_CORPUS_BOOST_PATH], ["${top_srcdir}/../boost_1_58_0"])
+m4_define([UCG_CORPUS_BOOST_PATH], ["${top_srcdir}/../TestCorpus/boost_1_58_0"])
 ## A built linux source tree.
 m4_define([UCG_CORPUS_LINUX_PATH], ["${top_srcdir}/../TestCorpus/linux"])
 

tests/test_cases.csv

@@ -1,7 +1,7 @@
 test_case_id, desc_short, desc_long, regex, corpus
-TC1, Test Case 1, "Benchmark: 'BOOST.*HPP' on Boost source.", BOOST.*HPP, "${top_srcdir}/../boost_1_58_0"
-TC2, Test Case 2, "Benchmark: '#include\\s+".*"' on Boost source", #include\\s+".*", "${top_srcdir}/../boost_1_58_0"
-TC3, Test Case 3, "Benchmark: literal '#endif' with --ignore-dir=doc on Boost source.", #endif, "${top_srcdir}/../boost_1_58_0"
+TC1, Test Case 1, "Benchmark: 'BOOST.*HPP' on Boost source.", BOOST.*HPP, "${top_srcdir}/../TestCorpus/boost_1_58_0"
+TC2, Test Case 2, "Benchmark: '#include\\s+".*"' on Boost source", #include\\s+".*", "${top_srcdir}/../TestCorpus/boost_1_58_0"
+TC3, Test Case 3, "Benchmark: literal '#endif' with --ignore-dir=doc on Boost source.", #endif, "${top_srcdir}/../TestCorpus/boost_1_58_0"
 TC4, "rg's linux_literal", "Benchmark: 'PM_RESUME' on Linux source.", PM_RESUME, "${top_srcdir}/../TestCorpus/linux"
 TC5, "rg's linux_alternates", "Benchmark: 'ERR_SYS|PME_TURN_OFF|LINK_REQ_RST|CFG_BME_EVT' on Linux source.", ERR_SYS|PME_TURN_OFF|LINK_REQ_RST|CFG_BME_EVT, "${top_srcdir}/../TestCorpus/linux"
 TC6, "rg's linux_re_literal_suffix", "Benchmark: '[A-Z]+_RESUME' on Linux source.", [A-Z]+_RESUME, "${top_srcdir}/../TestCorpus/linux"