[ 
https://issues.apache.org/jira/browse/HCATALOG-558?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Travis Crawford updated HCATALOG-558:
-------------------------------------

    Attachment: HCATALOG-558_test_from_src.3.patch

v3 is the final version of this patch that was committed. It differs from the 
review only in how it was applied.

PATCH GENERATED WITH:

fynn-2:hcatalog travis$ git diff --name-only apache/trunk | grep -v 'ant/' | 
grep -v build-common.xml | xargs git diff --no-prefix apache/trunk -- > 
HCATALOG-558_test_from_src.3.patch


MOVE ANT FILES AND APPLY DIFF:

fynn-2:trunk travis$ svn mkdir build-support/ant
A         build-support/ant
fynn-2:trunk travis$ svn mv ant/* build-support/ant/
A         build-support/ant/checkstyle.xml
D         ant/checkstyle.xml
A         build-support/ant/deploy.xml
D         ant/deploy.xml
A         build-support/ant/findbugs.xml
D         ant/findbugs.xml
A         build-support/ant/test.xml
D         ant/test.xml
fynn-2:trunk travis$ svn mv build-common.xml build-support/ant/
A         build-support/ant/build-common.xml
D         build-common.xml
fynn-2:trunk travis$ patch -p0 < 
~/src/hcatalog/HCATALOG-558_test_from_src.3.patch 
patching file build-support/scripts/test.sh
patching file build.xml
patching file core/build.xml
patching file hcatalog-pig-adapter/build.xml
patching file server-extensions/build.xml
patching file shims/build.xml
patching file storage-handlers/hbase/build.xml
patching file webhcat/java-client/build.xml
patching file webhcat/svr/build.xml
fynn-2:trunk travis$ 


MADE THIS CHANGE MANUALLY:

fynn-2:trunk travis$ diff /tmp/build-common.xml.orig 
build-support/ant/build-common.xml
32,35c32,35
<   <import file="${path.to.basedir}/ant/checkstyle.xml"/>
<   <import file="${path.to.basedir}/ant/deploy.xml"/>
<   <import file="${path.to.basedir}/ant/findbugs.xml"/>
<   <import file="${path.to.basedir}/ant/test.xml"/>
---
>   <import file="checkstyle.xml"/>
>   <import file="deploy.xml"/>
>   <import file="findbugs.xml"/>
>   <import file="test.xml"/>
fynn-2:trunk travis$ 


Tested with test.sh and things look good.

There were no functional changes in the final version. I simply applied it 
differently from a regular patch to perserve the file history.
                
> Update test.sh to test from an extracted src-release
> ----------------------------------------------------
>
>                 Key: HCATALOG-558
>                 URL: https://issues.apache.org/jira/browse/HCATALOG-558
>             Project: HCatalog
>          Issue Type: Bug
>            Reporter: Travis Crawford
>            Assignee: Travis Crawford
>             Fix For: 0.5
>
>         Attachments: HCATALOG-558_test_from_src.1.patch, 
> HCATALOG-558_test_from_src.2.patch, HCATALOG-558_test_from_src.3.patch
>
>
> To ensure our source release works correctly, we should run our tests from an 
> extracted source release.
> During the source tree refactor the src-release broke. In addition to fixing, 
> we need a check in place to prevent this from happening again.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Reply via email to