From 80c5b807d29dca9824bd31a21b72bde5283611fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Jun 2013 13:49:25 +0200
Subject: [PATCH] Fix tree toggles in VM tests

---
 lib/test-driver/log2html.xsl | 32 ++++++++++++++++----------------
 lib/testing.nix              |  2 --
 2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/lib/test-driver/log2html.xsl b/lib/test-driver/log2html.xsl
index 0123fc53760..8e907d85ffa 100644
--- a/lib/test-driver/log2html.xsl
+++ b/lib/test-driver/log2html.xsl
@@ -9,8 +9,8 @@
   <xsl:template match="logfile">
     <html>
       <head>
-        <script type="text/javascript" src="jquery.min.js"></script> 
-        <script type="text/javascript" src="jquery-ui.min.js"></script>
+        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+        <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
         <script type="text/javascript" src="treebits.js" />
         <link rel="stylesheet" href="logfile.css" type="text/css" />
         <title>Log File</title>
@@ -37,18 +37,18 @@
             </xsl:for-each>
           </ul>
         </xsl:if>
-        
+
       </body>
     </html>
   </xsl:template>
 
-  
+
   <xsl:template match="nest">
 
     <!-- The tree should be collapsed by default if all children are
          unimportant or if the header is unimportant. -->
     <xsl:variable name="collapsed" select="not(./head[@expanded]) and count(.//*[@error]) = 0"/>
-                  
+
     <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable>
 
     <xsl:if test="line|nest">
@@ -60,19 +60,19 @@
       </a>
       <xsl:text> </xsl:text>
     </xsl:if>
-    
+
     <xsl:apply-templates select='head'/>
 
     <!-- Be careful to only generate <ul>s if there are <li>s, otherwise it’s malformed. -->
     <xsl:if test="line|nest">
-      
+
       <ul class='nesting' style="{$style}">
         <xsl:for-each select='line|nest'>
 
           <!-- Is this the last line?  If so, mark it as such so that it
                can be rendered differently. -->
           <xsl:variable name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable>
-        
+
           <li class='{$class}'>
             <span class='lineconn' />
             <span class='linebody'>
@@ -82,10 +82,10 @@
         </xsl:for-each>
       </ul>
     </xsl:if>
-    
+
   </xsl:template>
 
-  
+
   <xsl:template match="head|line">
     <code>
       <xsl:if test="@error">
@@ -101,7 +101,7 @@
       <xsl:if test="@type = 'serial'">
         <xsl:attribute name="class">serial</xsl:attribute>
       </xsl:if>
-      
+
       <xsl:if test="@machine">
         <xsl:choose>
           <xsl:when test="@type = 'serial'">
@@ -112,7 +112,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:if>
-      
+
       <xsl:choose>
         <xsl:when test="@image">
           <a href="{@image}"><xsl:apply-templates/></a>
@@ -120,16 +120,16 @@
         <xsl:otherwise>
           <xsl:apply-templates/>
         </xsl:otherwise>
-      </xsl:choose>        
+      </xsl:choose>
     </code>
   </xsl:template>
 
-  
+
   <xsl:template match="storeref">
     <em class='storeref'>
       <span class='popup'><xsl:apply-templates/></span>
       <span class='elided'>/...</span><xsl:apply-templates select='name'/><xsl:apply-templates select='path'/>
     </em>
   </xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file
+
+</xsl:stylesheet>
diff --git a/lib/testing.nix b/lib/testing.nix
index 7c5bb5d50f7..9a72e1f4bd5 100644
--- a/lib/testing.nix
+++ b/lib/testing.nix
@@ -53,8 +53,6 @@ rec {
           xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
           ln -s ${./test-driver/logfile.css} $out/logfile.css
           ln -s ${./test-driver/treebits.js} $out/treebits.js
-          ln -s ${pkgs.jquery_ui}/js/jquery.min.js $out/
-          ln -s ${pkgs.jquery_ui}/js/jquery-ui.min.js $out/
 
           touch $out/nix-support/hydra-build-products
           echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
