X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Futilities%2Fpspp-output.at;h=3baa904f40b76adc49649a19bf164066c590756e;hb=b81922824d04dfc85e777827c3f978450dc62594;hp=a577867f76269c38b8b8e21859cc879fcced30cb;hpb=50f6ea7d66d03895020891215fb4f55bbf061003;p=pspp diff --git a/tests/utilities/pspp-output.at b/tests/utilities/pspp-output.at index a577867f76..3baa904f40 100644 --- a/tests/utilities/pspp-output.at +++ b/tests/utilities/pspp-output.at @@ -1,21 +1,36 @@ +dnl Copyright (C) 2020 Free Software Foundation + +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 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 You should have received a copy of the GNU General Public License +dnl along with this program. If not, see . + AT_BANNER([pspp-output]) AT_SETUP([pspp-output dir]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv], [0], [dnl -- heading "Set" command "Set" -- heading "Title" command "Title" +- group "Set" command "Set" +- group "Title" command "Title" - text "Page Title" command "Title" -- heading "Data List" command "Data List" +- group "Data List" command "Data List" - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" -- heading "Begin Data" command "Begin Data" -- heading "List" command "List" +- group "Begin Data" command "Begin Data" +- group "List" command "List" - table "Data List" command "List" -- heading "Frequencies" command "Frequencies" +- group "Frequencies" command "Frequencies" - table "Statistics" command "Frequencies" - table "v0" command "Frequencies" subtype "Frequencies" - table "v1" command "Frequencies" subtype "Frequencies" - table "v2" command "Frequencies" subtype "Frequencies" -- heading "Regression" command "Regression" +- group "Regression" command "Regression" - table "Model Summary (v2)" command "Regression" subtype "Model Summary" - table "ANOVA (v2)" command "Regression" subtype "ANOVA" - table "Coefficients (v2)" command "Regression" subtype "Coefficients" @@ -23,38 +38,40 @@ AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv], [0], [dnl AT_CLEANUP AT_SETUP([pspp-output --select equal]) -AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --select=headings], +AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --select=tables], [0], [dnl -- heading "Set" command "Set" -- heading "Title" command "Title" -- heading "Data List" command "Data List" -- heading "Begin Data" command "Begin Data" -- heading "List" command "List" -- heading "Frequencies" command "Frequencies" -- heading "Regression" command "Regression" +- table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" +- table "Data List" command "List" +- table "Statistics" command "Frequencies" +- table "v0" command "Frequencies" subtype "Frequencies" +- table "v1" command "Frequencies" subtype "Frequencies" +- table "v2" command "Frequencies" subtype "Frequencies" +- table "Model Summary (v2)" command "Regression" subtype "Model Summary" +- table "ANOVA (v2)" command "Regression" subtype "ANOVA" +- table "Coefficients (v2)" command "Regression" subtype "Coefficients" ]) AT_CLEANUP AT_SETUP([pspp-output --select unequal]) -AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --select=^headings], +AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --select=^outlineheaders], [0], [dnl - - text "Page Title" command "Title" - - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" - - table "Data List" command "List" - - table "Statistics" command "Frequencies" - - table "v0" command "Frequencies" subtype "Frequencies" - - table "v1" command "Frequencies" subtype "Frequencies" - - table "v2" command "Frequencies" subtype "Frequencies" - - table "Model Summary (v2)" command "Regression" subtype "Model Summary" - - table "ANOVA (v2)" command "Regression" subtype "ANOVA" - - table "Coefficients (v2)" command "Regression" subtype "Coefficients" +- text "Page Title" command "Title" +- table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" +- table "Data List" command "List" +- table "Statistics" command "Frequencies" +- table "v0" command "Frequencies" subtype "Frequencies" +- table "v1" command "Frequencies" subtype "Frequencies" +- table "v2" command "Frequencies" subtype "Frequencies" +- table "Model Summary (v2)" command "Regression" subtype "Model Summary" +- table "ANOVA (v2)" command "Regression" subtype "ANOVA" +- table "Coefficients (v2)" command "Regression" subtype "Coefficients" ]) AT_CLEANUP AT_SETUP([pspp-output --commands equal]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --commands='reg*'], [0], [dnl -- heading "Regression" command "Regression" +- group "Regression" command "Regression" - table "Model Summary (v2)" command "Regression" subtype "Model Summary" - table "ANOVA (v2)" command "Regression" subtype "ANOVA" - table "Coefficients (v2)" command "Regression" subtype "Coefficients" @@ -64,15 +81,15 @@ AT_CLEANUP AT_SETUP([pspp-output --commands unequal]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --commands='^reg*'], [0], [dnl -- heading "Set" command "Set" -- heading "Title" command "Title" +- group "Set" command "Set" +- group "Title" command "Title" - text "Page Title" command "Title" -- heading "Data List" command "Data List" +- group "Data List" command "Data List" - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" -- heading "Begin Data" command "Begin Data" -- heading "List" command "List" +- group "Begin Data" command "Begin Data" +- group "List" command "List" - table "Data List" command "List" -- heading "Frequencies" command "Frequencies" +- group "Frequencies" command "Frequencies" - table "Statistics" command "Frequencies" - table "v0" command "Frequencies" subtype "Frequencies" - table "v1" command "Frequencies" subtype "Frequencies" @@ -80,29 +97,43 @@ AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --commands='^reg*'], ]) AT_CLEANUP -AT_SETUP([pspp-output --subtypes equal]) -AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --subtypes='freq*'], +AT_SETUP([pspp-output --nth-commands]) +AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --nth-commands=2,4,6], [0], [dnl +- group "Title" command "Title" + - text "Page Title" command "Title" +- group "Begin Data" command "Begin Data" +- group "Frequencies" command "Frequencies" + - table "Statistics" command "Frequencies" - table "v0" command "Frequencies" subtype "Frequencies" - table "v1" command "Frequencies" subtype "Frequencies" - table "v2" command "Frequencies" subtype "Frequencies" ]) AT_CLEANUP +AT_SETUP([pspp-output --subtypes equal]) +AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --subtypes='freq*'], + [0], [dnl +- table "v0" command "Frequencies" subtype "Frequencies" +- table "v1" command "Frequencies" subtype "Frequencies" +- table "v2" command "Frequencies" subtype "Frequencies" +]) +AT_CLEANUP + AT_SETUP([pspp-output --subtypes unequal]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --subtypes='^freq*'], [0], [dnl -- heading "Set" command "Set" -- heading "Title" command "Title" +- group "Set" command "Set" +- group "Title" command "Title" - text "Page Title" command "Title" -- heading "Data List" command "Data List" +- group "Data List" command "Data List" - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" -- heading "Begin Data" command "Begin Data" -- heading "List" command "List" +- group "Begin Data" command "Begin Data" +- group "List" command "List" - table "Data List" command "List" -- heading "Frequencies" command "Frequencies" +- group "Frequencies" command "Frequencies" - table "Statistics" command "Frequencies" -- heading "Regression" command "Regression" +- group "Regression" command "Regression" - table "Model Summary (v2)" command "Regression" subtype "Model Summary" - table "ANOVA (v2)" command "Regression" subtype "ANOVA" - table "Coefficients (v2)" command "Regression" subtype "Coefficients" @@ -112,27 +143,27 @@ AT_CLEANUP AT_SETUP([pspp-output --labels equal]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --labels='v*'], [0], [dnl - - table "v0" command "Frequencies" subtype "Frequencies" - - table "v1" command "Frequencies" subtype "Frequencies" - - table "v2" command "Frequencies" subtype "Frequencies" +- table "v0" command "Frequencies" subtype "Frequencies" +- table "v1" command "Frequencies" subtype "Frequencies" +- table "v2" command "Frequencies" subtype "Frequencies" ]) AT_CLEANUP AT_SETUP([pspp-output --labels unequal]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --labels='^data*'], [0], [dnl -- heading "Set" command "Set" -- heading "Title" command "Title" +- group "Set" command "Set" +- group "Title" command "Title" - text "Page Title" command "Title" - - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" -- heading "Begin Data" command "Begin Data" -- heading "List" command "List" -- heading "Frequencies" command "Frequencies" +- table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" +- group "Begin Data" command "Begin Data" +- group "List" command "List" +- group "Frequencies" command "Frequencies" - table "Statistics" command "Frequencies" - table "v0" command "Frequencies" subtype "Frequencies" - table "v1" command "Frequencies" subtype "Frequencies" - table "v2" command "Frequencies" subtype "Frequencies" -- heading "Regression" command "Regression" +- group "Regression" command "Regression" - table "Model Summary (v2)" command "Regression" subtype "Model Summary" - table "ANOVA (v2)" command "Regression" subtype "ANOVA" - table "Coefficients (v2)" command "Regression" subtype "Coefficients" @@ -142,11 +173,11 @@ AT_CLEANUP AT_SETUP([pspp-output --instances]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --instances=1], [0], [dnl - - text "Page Title" command "Title" - - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" - - table "Data List" command "List" - - table "Statistics" command "Frequencies" - - table "Model Summary (v2)" command "Regression" subtype "Model Summary" +- text "Page Title" command "Title" +- table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" +- table "Data List" command "List" +- table "Statistics" command "Frequencies" +- table "Model Summary (v2)" command "Regression" subtype "Model Summary" ]) AT_CLEANUP @@ -154,11 +185,11 @@ AT_SETUP([pspp-output --instances=last]) AT_KEYWORDS([--instances last]) AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --instances=last], [0], [dnl - - text "Page Title" command "Title" - - table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" - - table "Data List" command "List" - - table "v2" command "Frequencies" subtype "Frequencies" - - table "Coefficients (v2)" command "Regression" subtype "Coefficients" +- text "Page Title" command "Title" +- table "Reading 1 record from INLINE." command "Data List" subtype "Fixed Data Records" +- table "Data List" command "List" +- table "v2" command "Frequencies" subtype "Frequencies" +- table "Coefficients (v2)" command "Regression" subtype "Coefficients" ]) AT_CLEANUP @@ -166,18 +197,18 @@ dnl XXX Currently PSPP doesn't output hidden items so no tests dnl XXX for --show-hidden. AT_SETUP([pspp-output --or]) -AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --select=headings --or --labels='v*'], +AT_CHECK([pspp-output dir $srcdir/utilities/regress.spv --select=outlineheaders --or --labels='v*'], [0], [dnl -- heading "Set" command "Set" -- heading "Title" command "Title" -- heading "Data List" command "Data List" -- heading "Begin Data" command "Begin Data" -- heading "List" command "List" -- heading "Frequencies" command "Frequencies" +- group "Set" command "Set" +- group "Title" command "Title" +- group "Data List" command "Data List" +- group "Begin Data" command "Begin Data" +- group "List" command "List" +- group "Frequencies" command "Frequencies" - table "v0" command "Frequencies" subtype "Frequencies" - table "v1" command "Frequencies" subtype "Frequencies" - table "v2" command "Frequencies" subtype "Frequencies" -- heading "Regression" command "Regression" +- group "Regression" command "Regression" ]) AT_CLEANUP