Merge branch 'master' into idle_tests

operasoftware · Feb 28, 2011 · db2d4da · db2d4da
2 parents 54ebcb7 + 9484737
commit db2d4da
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/build.xml b/build.xml
@@ -7,9 +7,11 @@
 
   <!-- Get version from Git, and output it to the VERSION file.
        This file is later copied to other locations. -->
-  <exec executable="git" outputproperty="version">
+  <exec executable="git" outputproperty="version" failifexecutionfails="false">
     <arg value="describe" />
   </exec>
+  <!-- If we can't get the version from git, set a default  -->
+  <property name="version" value="UNKNOWN-VERSION" />
   <echo message="${version}" file="VERSION" />
 
   <!-- Variables  -->
@@ -74,20 +76,13 @@
     <jar destfile="${jar.path}">
       <fileset dir="bin" includes="**/*.class" />
       <fileset dir="bin" includes="**/*.properties" />
+      <fileset dir="." includes="launcher/*" />
       <fileset file="VERSION" />
       <manifest>
       	<attribute name="Main-Class" value="com.opera.core.systems.OperaDriver" />
       	<attribute name="Implementation-Version" value="${version}" />
       </manifest>
     </jar>
-
-    <!-- Add the launchers. We do it this way to preserve their permissions.
-    In Ant 1.8+ we can add preservepermissions="true" to the <jar> element -->
-    <exec executable="zip" os="Linux">
-      <arg value="-r" />
-      <arg value="${jar.path}" />
-      <arg value="launcher/" />
-    </exec>
   </target>
 
   <!-- Compile any modified classes including test classes -->
@@ -105,7 +100,7 @@
     <delete dir="${test.report.path}" />
     <mkdir  dir="${test.report.path}" />
 
-    <junit fork="yes" haltonfailure="no" printsummary="yes" showoutput="no" outputtoformatters="no">
+    <junit fork="yes" haltonfailure="no" printsummary="yes" showoutput="yes" outputtoformatters="no">
       <formatter type="xml" usefile="true" />
       <classpath refid="test.classpath.path" />
       <classpath location="test" />

diff --git a/src/com/opera/core/systems/OperaDriver.java b/src/com/opera/core/systems/OperaDriver.java
@@ -743,7 +743,6 @@ public Timeouts setScriptTimeout(long time, TimeUnit unit) {
 	 * {@link #getOperaActionList()} at run time
 	 * @param params Parameters to pass to the action call
 	 */
-	@SuppressWarnings("unused")
 	public void operaAction(String using, String... params) {
 
 		exec.action(using, params);

diff --git a/test/com/opera/core/systems/OperaPathsTest.java b/test/com/opera/core/systems/OperaPathsTest.java
@@ -67,6 +67,7 @@ public void testLauncherEnvVar() throws Exception {
    *
    * @param newenv The new environment to set
    */
+  @SuppressWarnings("unchecked")
   private static void setEnv(Map<String, String> newenv) throws Exception {
     Class[] classes = Collections.class.getDeclaredClasses();
     Map<String, String> env = System.getenv();

diff --git a/test/com/opera/core/systems/TestBase.java b/test/com/opera/core/systems/TestBase.java
@@ -24,8 +24,8 @@ public static void setUpBeforeClass() throws Exception {
     // Setup the fixture directory
     String separator = System.getProperty("file.separator");
     fixture_dir = System.getProperty("user.dir");
-    fixture_dir = fixture_dir + separator + "test" + separator + "fixtures"
-        + separator;
+    fixture_dir = separator + fixture_dir + separator + separator + "test" +
+      separator + "fixtures" + separator;
 
     Assert.assertTrue(new File(fixture_dir).isDirectory());
   }