Merge remote-tracking branch 'origin/master' into sheet

[pspp] / tests / data / data-out.at

diff --git a/tests/data/data-out.at b/tests/data/data-out.at
index 6043d014b07dfd8375daafe36647cd471bfa42ea..f84e144928e74fbf1ef87eecb6c28fa5b4b71056 100644 (file)
--- a/tests/data/data-out.at
+++ b/tests/data/data-out.at
@@ -1,3 +1,19 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl 
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
 AT_BANNER([data output (data-out)])
 
 AT_SETUP([numeric format output])
@@ -14045,7 +14061,7 @@ print outfile='month-out.out'/x(month40).
 execute.
 ])
 AT_CHECK([pspp -O format=csv month-out.sps], [1], [stdout])
-AT_CHECK([[sed '/^$/d' stdout | sort | uniq -c | sed 's/^[     ]*//']], [0],
+AT_CHECK([[sed '/^ *\r*$/d' stdout | sort | uniq -c | sed 's/^[         ]*//']], [0],
 [dnl
 38 error: Month number 0.000000 is not between 1 and 12.
 38 error: Month number 0.500000 is not between 1 and 12.
@@ -14961,7 +14977,7 @@ end repeat.
 execute.
 ])
 AT_CHECK([pspp -O format=csv wkday-out.sps], [1], [stdout])
-AT_CHECK([[sed '/^$/d' stdout | sort | uniq -c | sed 's/^[     ]*//']], [0],
+AT_CHECK([[sed '/^ *\r*$/d' stdout | sort | uniq -c | sed 's/^[         ]*//']], [0],
 [dnl
 39 error: Weekday number 0.000000 is not between 1 and 7.
 39 error: Weekday number 0.500000 is not between 1 and 7.