Author: daijy
Date: Fri Feb 27 01:45:04 2015
New Revision: 1662616
URL: http://svn.apache.org/r1662616
Log:
PIG-4389: Flag to run selected test suites in e2e tests
Modified:
pig/trunk/CHANGES.txt
pig/trunk/test/e2e/pig/build.xml
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1662616&r1=1662615&r2=1662616&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Feb 27 01:45:04 2015
@@ -50,6 +50,8 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4389: Flag to run selected test suites in e2e tests (daijy)
+
PIG-4385: testDefaultBootup fails because it cannot find "pig.properties"
(mkudlej via daijy)
PIG-4397: CSVExcelStorage incorrect output if last field value is null (daijy)
Modified: pig/trunk/test/e2e/pig/build.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/build.xml?rev=1662616&r1=1662615&r2=1662616&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/build.xml (original)
+++ pig/trunk/test/e2e/pig/build.xml Fri Feb 27 01:45:04 2015
@@ -128,6 +128,28 @@
</not>
</condition>
+ <pathconvert property="tests.suites.all" pathsep=" ">
+ <path path="${test.location}/tests/cmdline.conf"/>
+ <path path="${test.location}/tests/multiquery.conf"/>
+ <path path="${test.location}/tests/negative.conf"/>
+ <path path="${test.location}/tests/nightly.conf"/>
+ <path path="${test.location}/tests/streaming.conf"/>
+ <path path="${test.location}/tests/streaming_local.conf"/>
+ <path path="${test.location}/tests/turing_jython.conf"/>
+ <path path="${test.location}/tests/bigdata.conf"/>
+ <path path="${test.location}/tests/grunt.conf"/>
+ <path path="${test.location}/tests/macro.conf"/>
+ <path path="${test.location}/tests/orc.conf"/>
+ <path path="${test.location}/tests/hcat.conf"/>
+ <path path="${test.location}/tests/utf8.conf"/>
+ </pathconvert>
+
+ <condition property="tests.suites" value="${tests.suites.all}">
+ <not>
+ <isset property="tests.suites"/>
+ </not>
+ </condition>
+
<target name="udfs">
<ant dir="${udf.java.dir}"/>
</target>
@@ -292,20 +314,7 @@
<env key="E2E_DEBUG" value="${e2e.debug}"/>
<arg value="./test_harness.pl"/>
- <arg line="${tests.to.run}"/>
- <arg value="${test.location}/tests/cmdline.conf"/>
- <arg value="${test.location}/tests/multiquery.conf"/>
- <arg value="${test.location}/tests/negative.conf"/>
- <arg value="${test.location}/tests/nightly.conf"/>
- <arg value="${test.location}/tests/streaming.conf"/>
- <arg value="${test.location}/tests/streaming_local.conf"/>
- <arg value="${test.location}/tests/turing_jython.conf"/>
- <arg value="${test.location}/tests/bigdata.conf"/>
- <arg value="${test.location}/tests/grunt.conf"/>
- <arg value="${test.location}/tests/macro.conf"/>
- <arg value="${test.location}/tests/orc.conf"/>
- <arg value="${test.location}/tests/hcat.conf"/>
- <arg value="${test.location}/tests/utf8.conf"/>
+ <arg line="${tests.to.run} ${tests.suites}"/>
</exec>
</target>
