Make spec test HTML look more like HTML from wild.sh and osh-parser.sh.

oilshell · Nov 4, 2017 · 9abab433ce3d83b9ce6db9b4daaeddae902df635 · 9abab43
1 parent e7e8f19
commit 9abab433ce3d83b9ce6db9b4daaeddae902df635
Unified Split

Showing with 24 additions and 6 deletions.

+8 −2 test/sh_spec.py

+5 −0 test/spec-runner.sh

+9 −4 web/spec-tests.css

+2 −0 web/table/table-sort.css
diff --git a/test/sh_spec.py b/test/sh_spec.py
@@ -640,13 +640,19 @@ def _SourceLink(self, line_num, desc):
        self.spec_name, line_num, cgi.escape(desc))

  def BeginCases(self, test_file):
-    self.f.write('''
+    self.f.write('''\
+<!DOCTYPE html>
 <html>
  <head>
    <link href="spec-tests.css" rel="stylesheet">
  </head>
  <body>
-    <h2>Results for %s</h2>
+    <p id="home-link">
+      <a href="RESULTS.html">spec test index</a>
+      /
+      <a href="/">oilshell.org</a>
+    </p>
+    <h1>Results for %s</h1>
    <table>
    ''' % test_file)

diff --git a/test/spec-runner.sh b/test/spec-runner.sh
@@ -64,12 +64,17 @@ readonly NUM_TASKS=400
 _html-summary() {
  # TODO: I think the style should be shared
  cat <<EOF
+<!DOCTYPE html>
 <html>
  <head>
    <link href="spec-tests.css" rel="stylesheet">
  </head>
  <body>

+<p id="home-link">
+  <a href="/">oilshell.org</a>
+</p>
+
 <h1>Spec Test Results Summary</h1>

 <table>
diff --git a/web/spec-tests.css b/web/spec-tests.css
@@ -1,14 +1,15 @@
 h1 {
-  text-align: center;
+  font-size: x-large;
 }

-h2 {
-  text-align: center;
+body {
+  margin: 0 auto;
+  width: 60em;
 }

 table {
-  margin: 0 auto;  /* center table on the page */
  border-collapse: collapse;
+  font-family: sans-serif;
 }
 p {
  text-align: center;
@@ -73,3 +74,7 @@ td {
  background-color: #ffffe0;
 }

+#home-link {
+  text-align: right;
+}
+
diff --git a/web/table/table-sort.css b/web/table/table-sort.css
@@ -5,11 +5,13 @@

 thead {
  font-weight: bold;
+  color: #444;
 }

 table {
  padding: 10px;  /* Padding makes it look nicer. */
  border-collapse: collapse;  /* this is like old cellpadding */
+  font-family: sans-serif;
 }

 /* like cellspacing? */