Merged upstream/master

2013-08-23 09:30:23 +02:00
parent 4b728a5196 0e49eacc98
commit b630140316
26 changed files with 230 additions and 115 deletions
--- a/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp
+++ b/opm/parser/eclipse/IntegrationTests/ParseWCONHIST.cpp
@@ -38,7 +38,7 @@ using namespace Opm;
 BOOST_AUTO_TEST_CASE( parse_WCHONHIST_OK ) {
    ParserPtr parser(new Parser());
    parser->loadKeywordsFromDirectory(KEYWORD_DIRECTORY);
-    boost::filesystem::path wconhistFile("testdata/WCONHIST/WCONHIST1");
+    boost::filesystem::path wconhistFile("testdata/integration_tests/WCONHIST/WCONHIST1");
    DeckPtr deck = parser->parse(wconhistFile.string());
    DeckKeywordConstPtr kw1 = deck->getKeyword("WCONHIST" , 0);
    BOOST_CHECK_EQUAL( 3U , kw1->size() );