[testng] 15/355: Merge pull request #137 from nullin/master

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit bd1e7d431b9a108ffe1b42f2976756e4b372cfb3
Merge: aee6705 a306ac2
Author: Cedric Beust <cedric at beust.com>
Date:   Sun Jun 2 18:22:52 2013 -0700

    Merge pull request #137 from nullin/master
    
    Fix handling of relative paths in suite files and Added CDATA to 6.2.5 sample XML

 .gitignore                                         |  2 ++
 CHANGES.txt                                        |  1 +
 doc/documentation-main.html                        |  7 ++--
 pom-test.xml                                       |  2 +-
 src/main/java/org/testng/TestNG.java               | 42 +++++++++++-----------
 src/main/java/org/testng/xml/Parser.java           | 27 ++++++--------
 .../java/test/CheckSuitesInitializationTest.java   | 42 ++++++++++++++++++++++
 .../checksuitesinitialization/child-suite1.xml     |  7 ++++
 .../checksuitesinitialization/child-suite2.xml     |  7 ++++
 .../children/child-suite-3.xml                     |  8 +++++
 .../children/child-suite-4.xml                     |  7 ++++
 .../children/morechildren/child-suite-5.xml        |  7 ++++
 .../checksuitesinitialization/parent-suite.xml     |  7 ++++
 13 files changed, 126 insertions(+), 40 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git