From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 30 Dec 2020 04:09:46 +0000 (-0800)
Subject: tests pass (except render)
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29d4ab4e8970f0dc4abd8fe18eb37b521cb44efb;p=pspp

tests pass (except render)
---

diff --git a/src/output/csv.c b/src/output/csv.c
index e6edfc6bfc..e4b1000769 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -216,9 +216,6 @@ csv_output_table_cell (struct csv_driver *csv, const struct table_cell *cell,
         }
       csv_output_field (csv, ds_cstr (&s));
       ds_destroy (&s);
-
-      if (leader)
-        putc ('\n', csv->file);
     }
 }
 
@@ -226,6 +223,9 @@ static void
 csv_output_table__ (struct csv_driver *csv, const struct table *t,
                     const char *leader)
 {
+  if (!t)
+    return;
+
   for (int y = 0; y < t->n[TABLE_VERT]; y++)
     {
       for (int x = 0; x < t->n[TABLE_HORZ]; x++)
diff --git a/src/output/pivot-output.c b/src/output/pivot-output.c
index 8c1aacc0a7..a1fba1a3ba 100644
--- a/src/output/pivot-output.c
+++ b/src/output/pivot-output.c
@@ -583,7 +583,7 @@ pivot_output (const struct pivot_table *pt,
           struct pivot_value *value = pivot_value_new_user_text_nocopy (
             ds_steal_cstr (&s));
 
-          fill_cell (layers, 0, i, 0, i,
+          fill_cell (footnotes, 0, i, 0, i,
                      &pt->look->areas[PIVOT_AREA_FOOTER], PIVOT_AREA_FOOTER,
                      value, pt->show_values, pt->show_variables, false);
         }
diff --git a/tests/automake.mk b/tests/automake.mk
index cb70fd3e8e..e15a8da663 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -236,13 +236,7 @@ tests_math_chart_get_ticks_format_test_LDADD = \
 	src/libpspp-core.la \
 	gl/libgl.la
 
-check_PROGRAMS += tests/output/render-test
-tests_output_render_test_SOURCES = tests/output/render-test.c
-tests_output_render_test_LDADD = \
-	src/libpspp.la \
-	src/libpspp-core.la \
-	$(CAIRO_LIBS)
-
+EXTRA_DIST += tests/output/render-test.c
 check_PROGRAMS += tests/ui/syntax-gen-test
 tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c
 tests_ui_syntax_gen_test_LDADD = \
diff --git a/tests/language/stats/correlations.at b/tests/language/stats/correlations.at
index 1662ee7499..9a24da63f2 100644
--- a/tests/language/stats/correlations.at
+++ b/tests/language/stats/correlations.at
@@ -61,9 +61,7 @@ wiz,Pearson Correlation,.890[a],.519,1.000,-.344
 ,Sig. (2-tailed),.017,.291,,.505
 bang,Pearson Correlation,-.308,.118,-.344,1.000
 ,Sig. (2-tailed),.553,.824,.505,
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 
 Table: Correlations
 ,,bar,wiz
@@ -86,9 +84,7 @@ wiz,Pearson Correlation,.883[a],.497,1.000,-.337
 bang,Pearson Correlation,-.308,.164,-.337,1.000
 ,Sig. (2-tailed),.553,.725,.460,
 ,N,6,7,7,7
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 ]])
 AT_CLEANUP
 
@@ -357,9 +353,7 @@ var2,Pearson Correlation,.3792[a],-.0407
 var3,Pearson Correlation,.3699[a],-.0543
 ,Sig. (2-tailed),.000,.603
 ,N,95,94
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 
 Table: Correlations
 ,,var1,var2
@@ -372,9 +366,7 @@ var4,Pearson Correlation,.5693[a],.3792[a]
 var5,Pearson Correlation,-.0519,-.0407
 ,Sig. (2-tailed),.623,.698
 ,N,92,93
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 ]])
 
 AT_CLEANUP
diff --git a/tests/language/stats/examine.at b/tests/language/stats/examine.at
index f22a4f5ce4..6c76b62d6d 100644
--- a/tests/language/stats/examine.at
+++ b/tests/language/stats/examine.at
@@ -860,9 +860,7 @@ x,.,4,100.0%,0,.0%,4,100.0%
 ,2,9,100.0%,0,.0%,9,100.0%
 ,9[a],4,100.0%,0,.0%,4,100.0%
 ,99[a],5,100.0%,0,.0%,5,100.0%
-
-Footnotes:
-a,User-missing value.
+Footnote: a. User-missing value.
 
 Table: Extreme Values
 ,g,,,Case Number,Value
@@ -916,9 +914,7 @@ x,.,Highest,1,31,4004
 ,,,3,25,701
 ,,,4,26,801
 ,,,5,27,901
-
-Footnotes:
-a,User-missing value.
+Footnote: a. User-missing value.
 ]])
 
 AT_CLEANUP
diff --git a/tests/output/render.at b/tests/output/render.at
index 8172e33571..0c461eb3fb 100644
--- a/tests/output/render.at
+++ b/tests/output/render.at
@@ -262,13 +262,11 @@ f[b]"
 h
 i[c][d][e]",j,
 ,klm,
-
-Footnotes:
-a,Approximation.
-b,This is a very long footnote that will have to wrap from one line to the next.  Let's see if the rendering engine does it acceptably.
-c,One
-d,Two
-e,Three
+Footnote: a. Approximation.
+Footnote: b. This is a very long footnote that will have to wrap from one line to the next.  Let's see if the rendering engine does it acceptably.
+Footnote: c. One
+Footnote: d. Two
+Footnote: e. Three
 ]])
 AT_CLEANUP
 
diff --git a/tests/perl-module.at b/tests/perl-module.at
index 58b3900cdf..5466dbc8b6 100644
--- a/tests/perl-module.at
+++ b/tests/perl-module.at
@@ -479,9 +479,7 @@ A Short String Variable,1111,ones
 A Numeric Variable,1,Unity
 ,2,Duality
 ,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
 
 Table: Variable and Dataset Attributes
 Variable and Name,,Value
@@ -516,9 +514,7 @@ A Short String Variable,1111,ones
 A Numeric Variable,1,Unity
 ,2,Duality
 ,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
 
 Table: Variable and Dataset Attributes
 Variable and Name,,Value