From 8e5c26270e2d447ea282e85ced56c42c1b56822e Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Thu, 3 Jan 2013 22:58:21 +0000
Subject: [PATCH] cross platform unit test hostname faking not relying on
 external tools

The original method failed on Archlinux. This should work everywhere.
---
 core/java/build.xml   | 16 ++++++++++------
 router/java/build.xml | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/core/java/build.xml b/core/java/build.xml
index 903052e2f..f9203326a 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -192,12 +192,14 @@
             <reporter type="stdout" />
             <reporter type="junitxml" directory="../../reports/core/scalatest/" />
         </scalatest>
-        <!-- fetch the real hostname of this machine -->
-        <exec executable="hostname" outputproperty="host.name"/>
         <!-- set if unset -->
         <property name="host.fakename" value="i2ptester" />
         <!-- replace hostname that junit inserts into reports with fake one -->
-        <replace dir="../../reports/core/scalatest/" token="${host.name}" value="${host.fakename}"/>
+        <replaceregexp byline="true"
+            match="(hostname=)&quot;[^&quot;]+&quot;"
+            replace="\1&quot;${host.fakename}&quot;">
+            <fileset dir="../../reports/core/scalatest/" />
+        </replaceregexp>
     </target>
     <target name="junit.test" depends="clean, junit.compileTest, prepareTest">
         <property name="hamcrest.home" value="${ant.home}/lib/" />
@@ -239,12 +241,14 @@
             </batchtest>
             <formatter type="xml"/>
         </junit>
-        <!-- fetch the real hostname of this machine -->
-        <exec executable="hostname" outputproperty="host.name"/>
         <!-- set if unset -->
         <property name="host.fakename" value="i2ptester" />
         <!-- replace hostname that junit inserts into reports with fake one -->
-        <replace dir="../../reports/core/junit/" token="${host.name}" value="${host.fakename}"/>
+        <replaceregexp byline="true"
+            match="(hostname=)&quot;[^&quot;]+&quot;"
+            replace="\1&quot;${host.fakename}&quot;">
+            <fileset dir="../../reports/core/junit/" />
+        </replaceregexp>
     </target>
     <target name="test" depends="junit.test, scalatest.test"/>
     <!-- test reports -->
diff --git a/router/java/build.xml b/router/java/build.xml
index 684627fd5..1f39086ab 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -204,12 +204,14 @@
             <reporter type="stdout" />
             <reporter type="junitxml" directory="../../reports/router/scalatest/" />
         </scalatest>
-        <!-- fetch the real hostname of this machine -->
-        <exec executable="hostname" outputproperty="host.name"/>
         <!-- set if unset -->
         <property name="host.fakename" value="i2ptester" />
         <!-- replace hostname that junit inserts into reports with fake one -->
-        <replace dir="../../reports/router/scalatest/" token="${host.name}" value="${host.fakename}"/>
+        <replaceregexp byline="true"
+            match="(hostname=)&quot;[^&quot;]+&quot;"
+            replace="\1&quot;${host.fakename}&quot;">
+            <fileset dir="../../reports/router/scalatest/" />
+        </replaceregexp>
     </target>
     <target name="junit.test" depends="clean, junit.compileTest, prepareTest">
         <mkdir dir="../../reports/router/junit/" />
@@ -240,12 +242,14 @@
             </batchtest>
             <formatter type="xml"/>
         </junit>
-        <!-- fetch the real hostname of this machine -->
-        <exec executable="hostname" outputproperty="host.name"/>
         <!-- set if unset -->
         <property name="host.fakename" value="i2ptester" />
         <!-- replace hostname that junit inserts into reports with fake one -->
-        <replace dir="../../reports/router/junit/" token="${host.name}" value="${host.fakename}"/>
+        <replaceregexp byline="true"
+            match="(hostname=)&quot;[^&quot;]+&quot;"
+            replace="\1&quot;${host.fakename}&quot;">
+            <fileset dir="../../reports/router/junit/" />
+        </replaceregexp>
     </target>
     <target name="test" depends="junit.test"/>
     <!-- test reports -->