| commit | ed8b8ebc21b9da5499eedc374a91bd155a64b4c2 | [log] [tgz] |
|---|---|---|
| author | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
| committer | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
| tree | 49b987f40f5189f11a10faf60126012c62372380 | |
| parent | b9dd63c1705cf84afbe71410b2086f602a3426a6 [diff] |
svn merge -r3112:3163 https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization svn merge -r3173:3188 https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3234 svn merge -r3209:3233 https://hyracks.googlecode.com/svn/trunk/fullstack git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3237 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java index 37f03a5..321b5b2 100644 --- a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java +++ b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/dataload/DataLoadTest.java
@@ -76,7 +76,7 @@ ClusterConfig.setStorePath(PATH_TO_CLUSTER_STORE); ClusterConfig.setClusterPropertiesPath(PATH_TO_CLUSTER_PROPERTIES); cleanupStores(); - PregelixHyracksIntegrationUtil.init(); + PregelixHyracksIntegrationUtil.init("src/test/resources/topology.xml"); PregelixHyracksIntegrationUtil.createApp(HYRACKS_APP_NAME); LOGGER.info("Hyracks mini-cluster started"); startHDFS();
diff --git a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java index 79a5c3c..fa98ebd 100644 --- a/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java +++ b/pregelix/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/jobrun/RunJobTestSuite.java
@@ -75,7 +75,7 @@ ClusterConfig.setStorePath(PATH_TO_CLUSTER_STORE); ClusterConfig.setClusterPropertiesPath(PATH_TO_CLUSTER_PROPERTIES); cleanupStores(); - PregelixHyracksIntegrationUtil.init(); + PregelixHyracksIntegrationUtil.init("src/test/resources/topology.xml"); PregelixHyracksIntegrationUtil.createApp(HYRACKS_APP_NAME); LOGGER.info("Hyracks mini-cluster started"); FileUtils.forceMkdir(new File(ACTUAL_RESULT_DIR));
diff --git a/pregelix/pregelix-example/src/test/resources/topology.xml b/pregelix/pregelix-example/src/test/resources/topology.xml new file mode 100755 index 0000000..2a6c380 --- /dev/null +++ b/pregelix/pregelix-example/src/test/resources/topology.xml
@@ -0,0 +1,7 @@ +<cluster-topology> + <network-switch name="Global"> + <network-switch name="local"> + <terminal name="127.1.0.1"/> + </network-switch> + </network-switch> +</cluster-topology> \ No newline at end of file