pyrox.dev
lol
nixos/test-reports: use local copy of jquery
The current way test reports get jquery,
src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"
only works when getting reports over http:// or https://, not file://.
Change it so that it works for all protocols by using a local copy of
jquery.
This fixes the issue where locally created and browsed test reports
cannot be navigated properly; clicking the '+' symbol to expand
sub-sections doesn't work.
+4
-2
+2
-2
nixos/lib/test-driver/log2html.xsl
+2
-2
nixos/lib/test-driver/log2html.xsl
···
9
9
<xsl:template match="logfile">
10
10
<html>
11
11
<head>
12
-
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
13
-
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
12
+
<script type="text/javascript" src="jquery.min.js"></script>
13
+
<script type="text/javascript" src="jquery-ui.min.js"></script>
14
14
<script type="text/javascript" src="treebits.js" />
15
15
<link rel="stylesheet" href="logfile.css" type="text/css" />
16
16
<title>Log File</title>
+2
nixos/lib/testing.nix
+2
nixos/lib/testing.nix
···
53
53
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
54
54
ln -s ${./test-driver/logfile.css} $out/logfile.css
55
55
ln -s ${./test-driver/treebits.js} $out/treebits.js
56
+
ln -s ${jquery}/js/jquery.min.js $out/
57
+
ln -s ${jquery-ui}/js/jquery-ui.min.js $out/
56
58
57
59
touch $out/nix-support/hydra-build-products
58
60
echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products