diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/Support-local-additions-to-magic-files/main.fmf b/tests/Support-local-additions-to-magic-files/main.fmf new file mode 100644 index 0000000..0cd12fd --- /dev/null +++ b/tests/Support-local-additions-to-magic-files/main.fmf @@ -0,0 +1,17 @@ +summary: Support local additions to magic files +description: |+ + Testing custom additions in + /etc/magic + $HOME/.magic + $HOME/.magic.mgc + +contact: Karel Srot +component: + - file +test: ./runtest.sh +framework: beakerlib +recommend: + - file +duration: 5m +extra-summary: Support-local-additions-to-magic-files +extra-task: Support-local-additions-to-magic-files diff --git a/tests/Support-local-additions-to-magic-files/runtest.sh b/tests/Support-local-additions-to-magic-files/runtest.sh index 2adcb02..b164fce 100755 --- a/tests/Support-local-additions-to-magic-files/runtest.sh +++ b/tests/Support-local-additions-to-magic-files/runtest.sh @@ -27,7 +27,6 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include Beaker environment -. /usr/bin/rhts-environment.sh . /usr/share/beakerlib/beakerlib.sh PACKAGE="file" diff --git a/tests/command-line-options/Makefile b/tests/command-line-options/Makefile index 240aeb3..beddecc 100644 --- a/tests/command-line-options/Makefile +++ b/tests/command-line-options/Makefile @@ -54,7 +54,7 @@ $(METADATA): Makefile @echo "Type: Sanity" >> $(METADATA) @echo "TestTime: 10m" >> $(METADATA) @echo "RunFor: file zlib" >> $(METADATA) - @echo "Requires: file" >> $(METADATA) + @echo "Requires: file bzip2" >> $(METADATA) @echo "Priority: Normal" >> $(METADATA) @echo "License: GPLv2" >> $(METADATA) @echo "Confidential: no" >> $(METADATA) diff --git a/tests/command-line-options/main.fmf b/tests/command-line-options/main.fmf new file mode 100644 index 0000000..2aed0ee --- /dev/null +++ b/tests/command-line-options/main.fmf @@ -0,0 +1,15 @@ +summary: Tests (most of) command line options available for the file command. +description: | + test multiple cmd line options +contact: Karel Srot +component: + - file + - zlib +test: ./runtest.sh +framework: beakerlib +recommend: + - bzip2 + - file +duration: 10m +extra-summary: /CoreOS/file/Sanity/command-line-options +extra-task: /CoreOS/file/Sanity/command-line-options diff --git a/tests/command-line-options/runtest.sh b/tests/command-line-options/runtest.sh index 174ab21..9eb80be 100755 --- a/tests/command-line-options/runtest.sh +++ b/tests/command-line-options/runtest.sh @@ -27,7 +27,6 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include rhts environment -. /usr/bin/rhts-environment.sh . /usr/share/beakerlib/beakerlib.sh PACKAGE="file" @@ -117,8 +116,8 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest "--version" - rlRun "file -v 2>&1 | egrep 'file-[[:digit:]]\.[[:digit:]]'" 0 "Checking -v" - rlRun "file --version 2>&1 | egrep 'file-[[:digit:]]\.[[:digit:]]'" 0 "Checking --version" + rlRun "file -v 2>&1 | grep -E 'file-[[:digit:]]\.[[:digit:]]'" 0 "Checking -v" + rlRun "file --version 2>&1 | grep -E 'file-[[:digit:]]\.[[:digit:]]'" 0 "Checking --version" rlPhaseEnd if ! rlIsRHEL 4; then # not for RHEL4 - this will never be fixed diff --git a/tests/file-tests/Makefile b/tests/file-tests/Makefile new file mode 100644 index 0000000..12f9811 --- /dev/null +++ b/tests/file-tests/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of file-tests +# Description: File regressions detection tests from github.com:file/file-tests.git +# Author: Jan Kaluza +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2023 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=file-tests +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) blocklist.txt db main.fmf Makefile prepare.sh readfile.py README reference reference.sh runtest.sh + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Jan Kaluza " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: File regressions detection tests from github.com:file/file-tests.git" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 20m" >> $(METADATA) + @echo "RunFor: file" >> $(METADATA) + @echo "Requires: file" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/file-tests/README b/tests/file-tests/README index 51dfd6c..8a702f3 100644 --- a/tests/file-tests/README +++ b/tests/file-tests/README @@ -1,3 +1,3 @@ ./prepare.sh ./reference.sh [--mime-type] -./runtest.sh [--mime-type] \ No newline at end of file +./runtest.sh [--mime-type] diff --git a/tests/file-tests/blacklist.txt b/tests/file-tests/blacklist.txt deleted file mode 100644 index c89aeef..0000000 --- a/tests/file-tests/blacklist.txt +++ /dev/null @@ -1,19 +0,0 @@ -cab/cabinet.cab -db/test.db -doc/encrypted.doc -doc/PMD.doc -dump/big-endian-dump -elf/library.so -elf/pie-now.out -elf/pie.out -img/qcow2.img -jpg/xsane-zoom-in.jpg -lnk/windows_link.lnk -pbm/icontopbm-back-from-icon.pbm -so/libaio.so -tar.gz/a.tar.gz -tgz/broken-file.tgz -webm/bunny.webm -xls/encrypted.xls -xls/excel-file.xls -xps/presentation.xps \ No newline at end of file diff --git a/tests/file-tests/blocklist.txt b/tests/file-tests/blocklist.txt new file mode 100644 index 0000000..d235b6b --- /dev/null +++ b/tests/file-tests/blocklist.txt @@ -0,0 +1,20 @@ +cab/cabinet.cab +db/test.db +doc/encrypted.doc +doc/PMD.doc +dump/big-endian-dump +elf/library.so +elf/pie-now.out +elf/pie.out +img/qcow2.img +jpg/xsane-zoom-in.jpg +lnk/windows_link.lnk +mach-o/PythonLauncher +pbm/icontopbm-back-from-icon.pbm +so/libaio.so +tar.gz/a.tar.gz +tgz/broken-file.tgz +webm/bunny.webm +xls/encrypted.xls +xls/excel-file.xls +xps/presentation.xps diff --git a/tests/file-tests/db/bmp/4x2x24-win3.bmp b/tests/file-tests/db/bmp/4x2x24-win3.bmp new file mode 100644 index 0000000..44599cd Binary files /dev/null and b/tests/file-tests/db/bmp/4x2x24-win3.bmp differ diff --git a/tests/file-tests/db/bmp/4x2x24-win3.bmp.source.txt b/tests/file-tests/db/bmp/4x2x24-win3.bmp.source.txt new file mode 100644 index 0000000..cf5da52 --- /dev/null +++ b/tests/file-tests/db/bmp/4x2x24-win3.bmp.source.txt @@ -0,0 +1,2 @@ +AUTHOR: Joerg Jenderek +LICENSE: BSD diff --git a/tests/file-tests/db/bmp/4x2x32-win95.bmp b/tests/file-tests/db/bmp/4x2x32-win95.bmp new file mode 100644 index 0000000..edc32b4 Binary files /dev/null and b/tests/file-tests/db/bmp/4x2x32-win95.bmp differ diff --git a/tests/file-tests/db/bmp/4x2x32-win95.bmp.source.txt b/tests/file-tests/db/bmp/4x2x32-win95.bmp.source.txt new file mode 100644 index 0000000..cf5da52 --- /dev/null +++ b/tests/file-tests/db/bmp/4x2x32-win95.bmp.source.txt @@ -0,0 +1,2 @@ +AUTHOR: Joerg Jenderek +LICENSE: BSD diff --git a/tests/file-tests/db/bmp/4x2x32-win98.bmp b/tests/file-tests/db/bmp/4x2x32-win98.bmp new file mode 100644 index 0000000..0bbf21b Binary files /dev/null and b/tests/file-tests/db/bmp/4x2x32-win98.bmp differ diff --git a/tests/file-tests/db/bmp/4x2x32-win98.bmp.source.txt b/tests/file-tests/db/bmp/4x2x32-win98.bmp.source.txt new file mode 100644 index 0000000..cf5da52 --- /dev/null +++ b/tests/file-tests/db/bmp/4x2x32-win98.bmp.source.txt @@ -0,0 +1,2 @@ +AUTHOR: Joerg Jenderek +LICENSE: BSD diff --git a/tests/file-tests/db/img/qcow2_v2.qcow2 b/tests/file-tests/db/img/qcow2_v2.qcow2 new file mode 100644 index 0000000..9e77104 Binary files /dev/null and b/tests/file-tests/db/img/qcow2_v2.qcow2 differ diff --git a/tests/file-tests/db/img/qcow2_v2.qcow2.source.txt b/tests/file-tests/db/img/qcow2_v2.qcow2.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/img/qcow2_v2.qcow2.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/img/qcow2_v3.qcow2 b/tests/file-tests/db/img/qcow2_v3.qcow2 new file mode 100644 index 0000000..24ce615 Binary files /dev/null and b/tests/file-tests/db/img/qcow2_v3.qcow2 differ diff --git a/tests/file-tests/db/img/qcow2_v3.qcow2.source.txt b/tests/file-tests/db/img/qcow2_v3.qcow2.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/img/qcow2_v3.qcow2.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/img/qcow_v1.qcow b/tests/file-tests/db/img/qcow_v1.qcow new file mode 100644 index 0000000..1c8c255 Binary files /dev/null and b/tests/file-tests/db/img/qcow_v1.qcow differ diff --git a/tests/file-tests/db/img/qcow_v1.qcow.source.txt b/tests/file-tests/db/img/qcow_v1.qcow.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/img/qcow_v1.qcow.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/json/1.json-keep b/tests/file-tests/db/json/1.json-keep new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/tests/file-tests/db/json/1.json-keep @@ -0,0 +1 @@ +{} diff --git a/tests/file-tests/db/json/2.json-keep b/tests/file-tests/db/json/2.json-keep new file mode 100644 index 0000000..b1b55f9 --- /dev/null +++ b/tests/file-tests/db/json/2.json-keep @@ -0,0 +1 @@ +{"foo": {}} diff --git a/tests/file-tests/db/json/3.json-keep b/tests/file-tests/db/json/3.json-keep new file mode 100644 index 0000000..09f4fd3 --- /dev/null +++ b/tests/file-tests/db/json/3.json-keep @@ -0,0 +1 @@ +{"foo": []} diff --git a/tests/file-tests/db/json/4.json-keep b/tests/file-tests/db/json/4.json-keep new file mode 100644 index 0000000..a75afb5 --- /dev/null +++ b/tests/file-tests/db/json/4.json-keep @@ -0,0 +1 @@ +["foo", "bar", {}] diff --git a/tests/file-tests/db/json/5.json-keep b/tests/file-tests/db/json/5.json-keep new file mode 100644 index 0000000..029ed81 --- /dev/null +++ b/tests/file-tests/db/json/5.json-keep @@ -0,0 +1 @@ +["foo"] diff --git a/tests/file-tests/db/locale/LC_ADDRESS b/tests/file-tests/db/locale/LC_ADDRESS new file mode 100644 index 0000000..d7dc871 Binary files /dev/null and b/tests/file-tests/db/locale/LC_ADDRESS differ diff --git a/tests/file-tests/db/locale/LC_ADDRESS.source.txt b/tests/file-tests/db/locale/LC_ADDRESS.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_ADDRESS.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_COLLATE b/tests/file-tests/db/locale/LC_COLLATE new file mode 100644 index 0000000..b143ff2 Binary files /dev/null and b/tests/file-tests/db/locale/LC_COLLATE differ diff --git a/tests/file-tests/db/locale/LC_COLLATE.source.txt b/tests/file-tests/db/locale/LC_COLLATE.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_COLLATE.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_CTYPE b/tests/file-tests/db/locale/LC_CTYPE new file mode 100644 index 0000000..f18566d Binary files /dev/null and b/tests/file-tests/db/locale/LC_CTYPE differ diff --git a/tests/file-tests/db/locale/LC_CTYPE.source.txt b/tests/file-tests/db/locale/LC_CTYPE.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_CTYPE.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_IDENTIFICATION b/tests/file-tests/db/locale/LC_IDENTIFICATION new file mode 100644 index 0000000..7d60ddd Binary files /dev/null and b/tests/file-tests/db/locale/LC_IDENTIFICATION differ diff --git a/tests/file-tests/db/locale/LC_IDENTIFICATION.source.txt b/tests/file-tests/db/locale/LC_IDENTIFICATION.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_IDENTIFICATION.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_MEASUREMENT b/tests/file-tests/db/locale/LC_MEASUREMENT new file mode 100644 index 0000000..5325e19 Binary files /dev/null and b/tests/file-tests/db/locale/LC_MEASUREMENT differ diff --git a/tests/file-tests/db/locale/LC_MEASUREMENT.source.txt b/tests/file-tests/db/locale/LC_MEASUREMENT.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_MEASUREMENT.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_MONETARY b/tests/file-tests/db/locale/LC_MONETARY new file mode 100644 index 0000000..bf5a137 Binary files /dev/null and b/tests/file-tests/db/locale/LC_MONETARY differ diff --git a/tests/file-tests/db/locale/LC_MONETARY.source.txt b/tests/file-tests/db/locale/LC_MONETARY.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_MONETARY.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_NAME b/tests/file-tests/db/locale/LC_NAME new file mode 100644 index 0000000..cafa1ed Binary files /dev/null and b/tests/file-tests/db/locale/LC_NAME differ diff --git a/tests/file-tests/db/locale/LC_NAME.source.txt b/tests/file-tests/db/locale/LC_NAME.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_NAME.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_NUMERIC b/tests/file-tests/db/locale/LC_NUMERIC new file mode 100644 index 0000000..23ba63a Binary files /dev/null and b/tests/file-tests/db/locale/LC_NUMERIC differ diff --git a/tests/file-tests/db/locale/LC_NUMERIC.source.txt b/tests/file-tests/db/locale/LC_NUMERIC.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_NUMERIC.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_PAPER b/tests/file-tests/db/locale/LC_PAPER new file mode 100644 index 0000000..18cfad8 Binary files /dev/null and b/tests/file-tests/db/locale/LC_PAPER differ diff --git a/tests/file-tests/db/locale/LC_PAPER.source.txt b/tests/file-tests/db/locale/LC_PAPER.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_PAPER.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_TELEPHONE b/tests/file-tests/db/locale/LC_TELEPHONE new file mode 100644 index 0000000..1042aff Binary files /dev/null and b/tests/file-tests/db/locale/LC_TELEPHONE differ diff --git a/tests/file-tests/db/locale/LC_TELEPHONE.source.txt b/tests/file-tests/db/locale/LC_TELEPHONE.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_TELEPHONE.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/locale/LC_TIME b/tests/file-tests/db/locale/LC_TIME new file mode 100644 index 0000000..0502b70 Binary files /dev/null and b/tests/file-tests/db/locale/LC_TIME differ diff --git a/tests/file-tests/db/locale/LC_TIME.source.txt b/tests/file-tests/db/locale/LC_TIME.source.txt new file mode 100644 index 0000000..8eee739 --- /dev/null +++ b/tests/file-tests/db/locale/LC_TIME.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Ondrej Dubaj +URL: Created it myself +LICENSE: public domain diff --git a/tests/file-tests/db/ppc/coredump-ppc b/tests/file-tests/db/ppc/coredump-ppc new file mode 100644 index 0000000..3caa025 Binary files /dev/null and b/tests/file-tests/db/ppc/coredump-ppc differ diff --git a/tests/file-tests/db/ppc/coredump-ppc.source.txt b/tests/file-tests/db/ppc/coredump-ppc.source.txt new file mode 100644 index 0000000..057db43 --- /dev/null +++ b/tests/file-tests/db/ppc/coredump-ppc.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Frantisek Sumsal +URL: Created if myself +LICENSE: public domain diff --git a/tests/file-tests/db/py/p1.py b/tests/file-tests/db/py/p1.py new file mode 100644 index 0000000..ee3ecd2 --- /dev/null +++ b/tests/file-tests/db/py/p1.py @@ -0,0 +1 @@ +#! /usr/bin/env python diff --git a/tests/file-tests/db/py/p2.py b/tests/file-tests/db/py/p2.py new file mode 100644 index 0000000..f56ebf4 --- /dev/null +++ b/tests/file-tests/db/py/p2.py @@ -0,0 +1 @@ +#! /usr/bin/env python diff --git a/tests/file-tests/db/py/p3.py b/tests/file-tests/db/py/p3.py new file mode 100644 index 0000000..4265cc3 --- /dev/null +++ b/tests/file-tests/db/py/p3.py @@ -0,0 +1 @@ +#!/usr/bin/env python diff --git a/tests/file-tests/db/py/p4.py b/tests/file-tests/db/py/p4.py new file mode 100644 index 0000000..1a9be17 --- /dev/null +++ b/tests/file-tests/db/py/p4.py @@ -0,0 +1 @@ +#!/usr/bin/env python diff --git a/tests/file-tests/db/py/p5.py b/tests/file-tests/db/py/p5.py new file mode 100644 index 0000000..440543b --- /dev/null +++ b/tests/file-tests/db/py/p5.py @@ -0,0 +1,2 @@ + +#!/usr/bin/env python diff --git a/tests/file-tests/db/py/p6.py b/tests/file-tests/db/py/p6.py new file mode 100644 index 0000000..e3ba536 --- /dev/null +++ b/tests/file-tests/db/py/p6.py @@ -0,0 +1 @@ +#! /usr/bin/env python diff --git a/tests/file-tests/db/slk/excel4_sample_macro.slk b/tests/file-tests/db/slk/excel4_sample_macro.slk new file mode 100644 index 0000000..3bd187c --- /dev/null +++ b/tests/file-tests/db/slk/excel4_sample_macro.slk @@ -0,0 +1,68 @@ +ID;PWXL;N;E +P;PGeneral +P;P0 +P;P0.00 +P;P#,##0 +P;P#,##0.00 +P;P#,##0;;\-#,##0 +P;P#,##0;;[Red]\-#,##0 +P;P#,##0.00;;\-#,##0.00 +P;P#,##0.00;;[Red]\-#,##0.00 +P;P#,##0\ "$";;\-#,##0\ "$" +P;P#,##0\ "$";;[Red]\-#,##0\ "$" +P;P#,##0.00\ "$";;\-#,##0.00\ "$" +P;P#,##0.00\ "$";;[Red]\-#,##0.00\ "$" +P;P0% +P;P0.00% +P;P0.00E+00 +P;P##0.0E+0 +P;P#" "?/? +P;P#" "??/?? +P;Pdd/mm/yyyy +P;Pdd\-mmm\-yy +P;Pdd\-mmm +P;Pmmm\-yy +P;Ph:mm\ AM/PM +P;Ph:mm:ss\ AM/PM +P;Phh:mm +P;Phh:mm:ss +P;Pdd/mm/yyyy\ hh:mm +P;Pmm:ss +P;Pmm:ss.0 +P;P@ +P;P[h]:mm:ss +P;P_-* #,##0\ "$"_-;;\-* #,##0\ "$"_-;;_-* "-"\ "$"_-;;_-@_- +P;P_-* #,##0_-;;\-* #,##0_-;;_-* "-"_-;;_-@_- +P;P_-* #,##0.00\ "$"_-;;\-* #,##0.00\ "$"_-;;_-* "-"??\ "$"_-;;_-@_- +P;P_-* #,##0.00_-;;\-* #,##0.00_-;;_-* "-"??_-;;_-@_- +P;FCalibri;M220;L9 +P;FCalibri;M220;L9 +P;FCalibri;M220;L9 +P;FCalibri;M220;L9 +P;ECalibri;M220;L9 +P;ECalibri Light;M360;L55 +P;ECalibri;M300;SB;L55 +P;ECalibri;M260;SB;L55 +P;ECalibri;M220;SB;L55 +P;ECalibri;M220;L18 +P;ECalibri;M220;L21 +P;ECalibri;M220;L61 +P;ECalibri;M220;L63 +P;ECalibri;M220;SB;L64 +P;ECalibri;M220;SB;L53 +P;ECalibri;M220;L53 +P;ECalibri;M220;SB;L10 +P;ECalibri;M220;L11 +P;ECalibri;M220;SI;L24 +P;ECalibri;M220;SB;L9 +P;ECalibri;M220;L10 +P;ESegoe UI;M200;L9 +F;P0;DG0G8;E;M292 +B;Y2;X1;D0 0 1 0 +O;L;E;D;V0;K47;G100 0.001 +F;W1 1 17 +F;W2 16384 9 +NN;NAuto_Open;ER1C1 +C;Y1;X1;KFALSE;EALERT("This is a sample Excel 4 macro") +C;Y2;KTRUE;EHALT() +E diff --git a/tests/file-tests/db/slk/excel4_sample_macro.slk.source.txt b/tests/file-tests/db/slk/excel4_sample_macro.slk.source.txt new file mode 100644 index 0000000..4838776 --- /dev/null +++ b/tests/file-tests/db/slk/excel4_sample_macro.slk.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Philippe Lagadec +URL: http://www.decalage.info/ +LICENSE: MIT diff --git a/tests/file-tests/db/slk/simple-slk-file.slk b/tests/file-tests/db/slk/simple-slk-file.slk new file mode 100644 index 0000000..1044e4d --- /dev/null +++ b/tests/file-tests/db/slk/simple-slk-file.slk @@ -0,0 +1,71 @@ +ID;PWXL;N;E +P;PGeneral +P;P0 +P;P0.00 +P;P#,##0 +P;P#,##0.00 +P;P#,##0;;\-#,##0 +P;P#,##0;;[Red]\-#,##0 +P;P#,##0.00;;\-#,##0.00 +P;P#,##0.00;;[Red]\-#,##0.00 +P;P#,##0\ "$";;\-#,##0\ "$" +P;P#,##0\ "$";;[Red]\-#,##0\ "$" +P;P#,##0.00\ "$";;\-#,##0.00\ "$" +P;P#,##0.00\ "$";;[Red]\-#,##0.00\ "$" +P;P0% +P;P0.00% +P;P0.00E+00 +P;P##0.0E+0 +P;P#" "?/? +P;P#" "??/?? +P;Pdd/mm/yyyy +P;Pdd\-mmm\-yy +P;Pdd\-mmm +P;Pmmm\-yy +P;Ph:mm\ AM/PM +P;Ph:mm:ss\ AM/PM +P;Phh:mm +P;Phh:mm:ss +P;Pdd/mm/yyyy\ hh:mm +P;Pmm:ss +P;Pmm:ss.0 +P;P@ +P;P[h]:mm:ss +P;P_-* #,##0\ "$"_-;;\-* #,##0\ "$"_-;;_-* "-"\ "$"_-;;_-@_- +P;P_-* #,##0_-;;\-* #,##0_-;;_-* "-"_-;;_-@_- +P;P_-* #,##0.00\ "$"_-;;\-* #,##0.00\ "$"_-;;_-* "-"??\ "$"_-;;_-@_- +P;P_-* #,##0.00_-;;\-* #,##0.00_-;;_-* "-"??_-;;_-@_- +P;FCalibri;M220;L9 +P;FCalibri;M220;L9 +P;FCalibri;M220;L9 +P;FCalibri;M220;L9 +P;ECalibri;M220;L9 +P;ECalibri Light;M360;L55 +P;ECalibri;M300;SB;L55 +P;ECalibri;M260;SB;L55 +P;ECalibri;M220;SB;L55 +P;ECalibri;M220;L18 +P;ECalibri;M220;L21 +P;ECalibri;M220;L61 +P;ECalibri;M220;L63 +P;ECalibri;M220;SB;L64 +P;ECalibri;M220;SB;L53 +P;ECalibri;M220;L53 +P;ECalibri;M220;SB;L10 +P;ECalibri;M220;L11 +P;ECalibri;M220;SI;L24 +P;ECalibri;M220;SB;L9 +P;ECalibri;M220;L10 +P;ESegoe UI;M200;L9 +F;P0;DG0G8;M292 +B;Y4;X2;D0 0 3 1 +O;L;D;V0;K47;G100 0.001 +F;W1 16384 9 +C;Y1;X1;K"This is a sample SLK file." +C;Y2;K1 +C;X2;K4 +C;Y3;X1;K2 +C;X2;K5 +C;Y4;X1;K3 +C;X2;K6 +E diff --git a/tests/file-tests/db/slk/simple-slk-file.slk.source.txt b/tests/file-tests/db/slk/simple-slk-file.slk.source.txt new file mode 100644 index 0000000..4838776 --- /dev/null +++ b/tests/file-tests/db/slk/simple-slk-file.slk.source.txt @@ -0,0 +1,3 @@ +AUTHOR: Philippe Lagadec +URL: http://www.decalage.info/ +LICENSE: MIT diff --git a/tests/file-tests/main.fmf b/tests/file-tests/main.fmf new file mode 100644 index 0000000..81d6b2b --- /dev/null +++ b/tests/file-tests/main.fmf @@ -0,0 +1,11 @@ +summary: File regressions detection tests from github.com:file/file-tests.git +contact: Jan Kaluza +component: + - file +test: ./runtest.sh +framework: beakerlib +recommend: + - file +duration: 20m +extra-summary: file-tests +extra-task: file-tests diff --git a/tests/file-tests/prepare.sh b/tests/file-tests/prepare.sh index 22eee1b..b7bfb6d 100755 --- a/tests/file-tests/prepare.sh +++ b/tests/file-tests/prepare.sh @@ -1,54 +1,55 @@ -#!/bin/bash +#!/bin/bash -ex +# Clone rm -rf runtest.sh db tmp git clone https://github.com/file/file-tests.git cp -a file-tests/db . rm -rf file-tests -blacklist=`python -c 'from readfile import *; print " ".join(main())'` +blocklist="$(python3 -c 'from readfile import *; print(" ".join(main()))')" -printf "#!/bin/bash +# Prepare +printf $'#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh -mkdir tmp -cd db -for d in * ; do - mkdir ../tmp/\$d - for f in \$d/* ; do - if [[ \${f: -11} != \".source.txt\" ]]; then - file \$1 \$f | sed -n -e \"s:\$f\: ::p\" | sed 's/,//g' > ../tmp/\$f.my - fi - done -done +compare() { + IN="db/$1" + OUT="$TMPDIR/out" + rlRun "file \'$IN\' > \'$OUT\'" "0" "Run file on $1" + sed -i "s|^$IN: ||" "$OUT" + REF="reference/$1.ref" + if ! rlAssertNotDiffer "$REF" "$OUT"; then + rlRun -l "diff -u \'$REF\' \'$OUT\'" 1 + fi +} -cd .. - -. /usr/bin/rhts-environment.sh -. /usr/share/beakerlib/beakerlib.sh - -PACKAGE=\"file\" +PACKAGE="file" rlJournalStart - rlPhaseStartSetup - rlAssertRpm \$PACKAGE - rlPhaseEnd\n\n" > runtest.sh - -cd db - -for d in * ; do - printf " rlPhaseStartTest \"$d\"\n" >> ../runtest.sh - for f in $d/* ; do - if [[ ${f: -11} != ".source.txt" && "${blacklist[*]}" != *"$f"* ]]; then - printf " rlAssertNotDiffer \"reference/$f.ref\" \"tmp/$f.my\"\n" >> ../runtest.sh - fi - done - printf " rlPhaseEnd\n\n" >> ../runtest.sh -done - -cd .. - -printf " rlJournalPrintText -rlJournalEnd -rm -rf tmp" >> runtest.sh + rlPhaseStartSetup + rlAssertRpm "$PACKAGE" + TMPDIR="$(mktemp -d)" + rlPhaseEnd\n\n' > runtest.sh + +( + cd db + for d in * ; do + printf " rlPhaseStartTest '%s'\n" "$d" >> ../runtest.sh + for f in "$d"/* ; do + if [[ ${f: -11} != ".source.txt" && "${blocklist[*]}" != *"$f"* ]]; then + printf " compare '%s'\n" "$f" >> ../runtest.sh + fi + done + printf " rlPhaseEnd\n\n" >> ../runtest.sh + done +) + +printf " rlPhaseStartCleanup + rm -rf \"\$TMPDIR\" + rlPhaseEnd + + rlJournalPrintText +rlJournalEnd\n" >> runtest.sh chmod +x runtest.sh diff --git a/tests/file-tests/readfile.py b/tests/file-tests/readfile.py index e438d64..c6c79b6 100644 --- a/tests/file-tests/readfile.py +++ b/tests/file-tests/readfile.py @@ -1,6 +1,10 @@ +#!/usr/bin/python3 + def main(): - f = open("blacklist.txt","r") - fl = f.readlines() - return fl -if __name__== "__main__": - main() \ No newline at end of file + f = open("blocklist.txt") + fl = f.readlines() + return fl + + +if __name__ == "__main__": + main() diff --git a/tests/file-tests/reference.sh b/tests/file-tests/reference.sh index 89ffbb8..413aa4f 100755 --- a/tests/file-tests/reference.sh +++ b/tests/file-tests/reference.sh @@ -1,20 +1,14 @@ -#!/bin/bash - -rm -rf reference db -git clone https://github.com/file/file-tests.git -cp -a file-tests/db . -rm -rf file-tests +#!/bin/bash -ex +rm -rf reference mkdir reference + cd db for d in * ; do - mkdir ../reference/$d - for f in $d/* ; do - if [[ ${f: -11} != ".source.txt" ]]; then - file $1 $f | sed -n -e "s:$f\: ::p" | sed 's/,//g' > ../reference/$f.ref - fi - done + mkdir "../reference/$d" + for f in "$d"/* ; do + if [[ ${f: -11} != ".source.txt" ]]; then + file "$f" | sed "s|$f: ||" > "../reference/$f.ref" + fi + done done - -cd .. -rm -rf db \ No newline at end of file diff --git a/tests/file-tests/reference/7z/spectrum.7z.ref b/tests/file-tests/reference/7z/spectrum.7z.ref index 158af84..7ff00f8 100644 --- a/tests/file-tests/reference/7z/spectrum.7z.ref +++ b/tests/file-tests/reference/7z/spectrum.7z.ref @@ -1 +1 @@ -7-zip archive data version 0.3 +7-zip archive data, version 0.3 diff --git a/tests/file-tests/reference/ade/ms_access_project_encoded.ade.ref b/tests/file-tests/reference/ade/ms_access_project_encoded.ade.ref index b55d7b7..497592b 100644 --- a/tests/file-tests/reference/ade/ms_access_project_encoded.ade.ref +++ b/tests/file-tests/reference/ade/ms_access_project_encoded.ade.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 5.1 Code page: 1252 Title: ms_access_project_encoded Author: ch +Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Code page: 1252, Title: ms_access_project_encoded, Author: ch diff --git a/tests/file-tests/reference/adp/ms_access_project.adp.ref b/tests/file-tests/reference/adp/ms_access_project.adp.ref index e92e775..816212b 100644 --- a/tests/file-tests/reference/adp/ms_access_project.adp.ref +++ b/tests/file-tests/reference/adp/ms_access_project.adp.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 5.1 Code page: 1252 Title: ms_access_project Author: ch +Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Code page: 1252, Title: ms_access_project, Author: ch diff --git a/tests/file-tests/reference/ani/animated_cursor.ani.ref b/tests/file-tests/reference/ani/animated_cursor.ani.ref index e9b749f..389dc93 100644 --- a/tests/file-tests/reference/ani/animated_cursor.ani.ref +++ b/tests/file-tests/reference/ani/animated_cursor.ani.ref @@ -1 +1 @@ -RIFF (little-endian) data animated cursor +RIFF (little-endian) data, animated cursor diff --git a/tests/file-tests/reference/asa/global.asa.ref b/tests/file-tests/reference/asa/global.asa.ref index 62d87d7..0258011 100644 --- a/tests/file-tests/reference/asa/global.asa.ref +++ b/tests/file-tests/reference/asa/global.asa.ref @@ -1 +1 @@ -HTML document ASCII text +HTML document, ASCII text diff --git a/tests/file-tests/reference/asp/policies_part.asp.ref b/tests/file-tests/reference/asp/policies_part.asp.ref index 62d87d7..0258011 100644 --- a/tests/file-tests/reference/asp/policies_part.asp.ref +++ b/tests/file-tests/reference/asp/policies_part.asp.ref @@ -1 +1 @@ -HTML document ASCII text +HTML document, ASCII text diff --git a/tests/file-tests/reference/bat/build.bat.ref b/tests/file-tests/reference/bat/build.bat.ref index 4481044..f56467b 100644 --- a/tests/file-tests/reference/bat/build.bat.ref +++ b/tests/file-tests/reference/bat/build.bat.ref @@ -1 +1 @@ -DOS batch file ASCII text +DOS batch file, ASCII text diff --git a/tests/file-tests/reference/bmp/4x2x24-win3.bmp.ref b/tests/file-tests/reference/bmp/4x2x24-win3.bmp.ref new file mode 100644 index 0000000..c160c70 --- /dev/null +++ b/tests/file-tests/reference/bmp/4x2x24-win3.bmp.ref @@ -0,0 +1 @@ +PC bitmap, Windows 3.x format, 4 x 2 x 24, image size 24, resolution 2835 x 2835 px/m, cbSize 78, bits offset 54 diff --git a/tests/file-tests/reference/bmp/4x2x32-win95.bmp.ref b/tests/file-tests/reference/bmp/4x2x32-win95.bmp.ref new file mode 100644 index 0000000..6903cdb --- /dev/null +++ b/tests/file-tests/reference/bmp/4x2x32-win95.bmp.ref @@ -0,0 +1 @@ +PC bitmap, Windows 95/NT4 and newer format, 4 x 2 x 32, cbSize 154, bits offset 122 diff --git a/tests/file-tests/reference/bmp/4x2x32-win98.bmp.ref b/tests/file-tests/reference/bmp/4x2x32-win98.bmp.ref new file mode 100644 index 0000000..c45d9af --- /dev/null +++ b/tests/file-tests/reference/bmp/4x2x32-win98.bmp.ref @@ -0,0 +1 @@ +PC bitmap, Windows 98/2000 and newer format, 4 x 2 x 32, cbSize 170, bits offset 138 diff --git a/tests/file-tests/reference/bmp/InstallerHeader.bmp.ref b/tests/file-tests/reference/bmp/InstallerHeader.bmp.ref index fa7d2ca..ff6689c 100644 --- a/tests/file-tests/reference/bmp/InstallerHeader.bmp.ref +++ b/tests/file-tests/reference/bmp/InstallerHeader.bmp.ref @@ -1 +1 @@ -PC bitmap Windows 3.x format 150 x 57 x 24 +PC bitmap, Windows 3.x format, 150 x 57 x 24, image size 25764, resolution 3543 x 3543 px/m, cbSize 25818, bits offset 54 diff --git a/tests/file-tests/reference/cab/cabinet.cab.ref b/tests/file-tests/reference/cab/cabinet.cab.ref deleted file mode 100644 index 9d6d025..0000000 --- a/tests/file-tests/reference/cab/cabinet.cab.ref +++ /dev/null @@ -1 +0,0 @@ -Microsoft Cabinet archive data many 345055 bytes 26 files at 0x2c +A "Bonjour.Resources_da.lproj_AboutBonjour.rtf" +A "Bonjour.Resources_de.lproj_Abo" number 1 34 datablocks 0x1503 compression diff --git a/tests/file-tests/reference/cmd/wp_batch_example.cmd.ref b/tests/file-tests/reference/cmd/wp_batch_example.cmd.ref index 4481044..f56467b 100644 --- a/tests/file-tests/reference/cmd/wp_batch_example.cmd.ref +++ b/tests/file-tests/reference/cmd/wp_batch_example.cmd.ref @@ -1 +1 @@ -DOS batch file ASCII text +DOS batch file, ASCII text diff --git a/tests/file-tests/reference/cnt/help-contents.cnt.ref b/tests/file-tests/reference/cnt/help-contents.cnt.ref index a9c09a1..17c88e7 100644 --- a/tests/file-tests/reference/cnt/help-contents.cnt.ref +++ b/tests/file-tests/reference/cnt/help-contents.cnt.ref @@ -1 +1 @@ -MS Windows help file Content based "help-contents.hlp" ASCII text +MS Windows help file Content, based "help-contents.hlp", ASCII text diff --git a/tests/file-tests/reference/cpl/ac3filter_first4k.cpl.ref b/tests/file-tests/reference/cpl/ac3filter_first4k.cpl.ref index 389a54e..9889e02 100644 --- a/tests/file-tests/reference/cpl/ac3filter_first4k.cpl.ref +++ b/tests/file-tests/reference/cpl/ac3filter_first4k.cpl.ref @@ -1 +1 @@ -PE32 executable (DLL) (GUI) Intel 80386 for MS Windows +PE32 executable (DLL) (GUI) Intel 80386, for MS Windows diff --git a/tests/file-tests/reference/cpp/test.cpp.ref b/tests/file-tests/reference/cpp/test.cpp.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/cpp/test.cpp.ref +++ b/tests/file-tests/reference/cpp/test.cpp.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/cur/cursor.cur.ref b/tests/file-tests/reference/cur/cursor.cur.ref index 2d71be1..a81a386 100644 --- a/tests/file-tests/reference/cur/cursor.cur.ref +++ b/tests/file-tests/reference/cur/cursor.cur.ref @@ -1 +1 @@ -MS Windows cursor resource - 1 icon 32x32 hotspot @0x0 +MS Windows cursor resource - 1 icon, 32x32, hotspot @0x0 diff --git a/tests/file-tests/reference/db/sqlite3.db.ref b/tests/file-tests/reference/db/sqlite3.db.ref index 917598c..46e5a2f 100644 --- a/tests/file-tests/reference/db/sqlite3.db.ref +++ b/tests/file-tests/reference/db/sqlite3.db.ref @@ -1 +1 @@ -SQLite 3.x database last written using SQLite version 0 +SQLite 3.x database, last written using SQLite version 0, page size 1024, file counter 1, database pages 0, cookie 0x1, schema 1, UTF-8, version-valid-for 0 diff --git a/tests/file-tests/reference/db/test.db.ref b/tests/file-tests/reference/db/test.db.ref deleted file mode 100644 index c6a2c7f..0000000 --- a/tests/file-tests/reference/db/test.db.ref +++ /dev/null @@ -1 +0,0 @@ -Berkeley DB (Hash version 9 native byte-order) diff --git a/tests/file-tests/reference/db/thumbs.db.ref b/tests/file-tests/reference/db/thumbs.db.ref index 80c2148..beb3f9f 100644 --- a/tests/file-tests/reference/db/thumbs.db.ref +++ b/tests/file-tests/reference/db/thumbs.db.ref @@ -1 +1 @@ -Composite Document File V2 Document Cannot read section info +Composite Document File V2 Document, Cannot read section info diff --git a/tests/file-tests/reference/dbf/biblio.dbf.ref b/tests/file-tests/reference/dbf/biblio.dbf.ref index e6ec53c..1e22489 100644 --- a/tests/file-tests/reference/dbf/biblio.dbf.ref +++ b/tests/file-tests/reference/dbf/biblio.dbf.ref @@ -1 +1 @@ -FoxBase+/dBase III with memo .DBT DBF 92 records * 3727 update-date 06-12-5 +FoxBase+/dBase III, with memo .DBT DBF, 92 records * 3727, update-date 06-12-5 diff --git a/tests/file-tests/reference/deb/p.deb.ref b/tests/file-tests/reference/deb/p.deb.ref index 6c4ea95..ca24a8d 100644 --- a/tests/file-tests/reference/deb/p.deb.ref +++ b/tests/file-tests/reference/deb/p.deb.ref @@ -1 +1 @@ -Debian binary package (format 2.0) +Debian binary package (format 2.0), with control.tar.gz, data compression gz diff --git a/tests/file-tests/reference/dll/SDL2.dll.ref b/tests/file-tests/reference/dll/SDL2.dll.ref index 3aa92c3..1a0b37a 100644 --- a/tests/file-tests/reference/dll/SDL2.dll.ref +++ b/tests/file-tests/reference/dll/SDL2.dll.ref @@ -1 +1 @@ -PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB) for MS Windows +PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB), for MS Windows diff --git a/tests/file-tests/reference/dmp/mdmp.dmp.ref b/tests/file-tests/reference/dmp/mdmp.dmp.ref index a3d34b1..e369e13 100644 --- a/tests/file-tests/reference/dmp/mdmp.dmp.ref +++ b/tests/file-tests/reference/dmp/mdmp.dmp.ref @@ -1 +1 @@ -Mini DuMP crash report 6 streams Mon Feb 16 21:10:58 2009 0x0 type +Mini DuMP crash report, 6 streams, Mon Feb 16 21:10:58 2009, 0 type diff --git a/tests/file-tests/reference/doc/PMD.doc.ref b/tests/file-tests/reference/doc/PMD.doc.ref deleted file mode 100644 index 8852cb2..0000000 --- a/tests/file-tests/reference/doc/PMD.doc.ref +++ /dev/null @@ -1 +0,0 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 5.1 Code page: 1252 Author: Bekrar Template: Normal.dot Last Saved By: Bekrar Revision Number: 2 Name of Creating Application: Microsoft Office Word Total Editing Time: 01:00 Create Time/Date: Tue Aug 16 09:51:00 2005 Last Saved Time/Date: Tue Aug 16 10:02:00 2005 Number of Pages: 2 Number of Words: 646 Number of Characters: 3555 Security: 0 diff --git a/tests/file-tests/reference/doc/encrypted.doc.ref b/tests/file-tests/reference/doc/encrypted.doc.ref deleted file mode 100644 index 853b34d..0000000 --- a/tests/file-tests/reference/doc/encrypted.doc.ref +++ /dev/null @@ -1 +0,0 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: user Template: Normal.dotm Last Saved By: user Revision Number: 2 Name of Creating Application: Microsoft Office Word Create Time/Date: Wed Oct 17 12:27:00 2018 Last Saved Time/Date: Wed Oct 17 12:27:00 2018 Number of Pages: 1 Number of Words: 6 Number of Characters: 42 Security: 1 diff --git a/tests/file-tests/reference/doc/word_document.doc.ref b/tests/file-tests/reference/doc/word_document.doc.ref index 6c85e78..d2cf345 100644 --- a/tests/file-tests/reference/doc/word_document.doc.ref +++ b/tests/file-tests/reference/doc/word_document.doc.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Template: Normal.dotm Last Saved By: schulung Revision Number: 2 Name of Creating Application: Microsoft Office Word Create Time/Date: Fri Mar 11 12:58:00 2016 Last Saved Time/Date: Fri Mar 11 12:58:00 2016 Number of Pages: 1 Number of Words: 33 Number of Characters: 210 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Template: Normal.dotm, Last Saved By: schulung, Revision Number: 2, Name of Creating Application: Microsoft Office Word, Create Time/Date: Fri Mar 11 12:58:00 2016, Last Saved Time/Date: Fri Mar 11 12:58:00 2016, Number of Pages: 1, Number of Words: 33, Number of Characters: 210, Security: 0 diff --git a/tests/file-tests/reference/doc/word_document_with_autostart_macro.doc.ref b/tests/file-tests/reference/doc/word_document_with_autostart_macro.doc.ref index 7912bab..315add9 100644 --- a/tests/file-tests/reference/doc/word_document_with_autostart_macro.doc.ref +++ b/tests/file-tests/reference/doc/word_document_with_autostart_macro.doc.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Template: Normal.dotm Last Saved By: schulung Revision Number: 2 Name of Creating Application: Microsoft Office Word Create Time/Date: Fri Mar 11 10:26:00 2016 Last Saved Time/Date: Fri Mar 11 10:26:00 2016 Number of Pages: 1 Number of Words: 33 Number of Characters: 210 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Template: Normal.dotm, Last Saved By: schulung, Revision Number: 2, Name of Creating Application: Microsoft Office Word, Create Time/Date: Fri Mar 11 10:26:00 2016, Last Saved Time/Date: Fri Mar 11 10:26:00 2016, Number of Pages: 1, Number of Words: 33, Number of Characters: 210, Security: 0 diff --git a/tests/file-tests/reference/dot/word_document.dot.ref b/tests/file-tests/reference/dot/word_document.dot.ref index 402ca08..fab0ef2 100644 --- a/tests/file-tests/reference/dot/word_document.dot.ref +++ b/tests/file-tests/reference/dot/word_document.dot.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Template: word_document.dot Last Saved By: schulung Revision Number: 2 Name of Creating Application: Microsoft Office Word Create Time/Date: Fri Mar 11 12:59:00 2016 Last Saved Time/Date: Fri Mar 11 12:59:00 2016 Number of Pages: 1 Number of Words: 33 Number of Characters: 210 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Template: word_document.dot, Last Saved By: schulung, Revision Number: 2, Name of Creating Application: Microsoft Office Word, Create Time/Date: Fri Mar 11 12:59:00 2016, Last Saved Time/Date: Fri Mar 11 12:59:00 2016, Number of Pages: 1, Number of Words: 33, Number of Characters: 210, Security: 0 diff --git a/tests/file-tests/reference/dot/word_document_with_autostart_macro.dot.ref b/tests/file-tests/reference/dot/word_document_with_autostart_macro.dot.ref index 08b2d46..cdc49a1 100644 --- a/tests/file-tests/reference/dot/word_document_with_autostart_macro.dot.ref +++ b/tests/file-tests/reference/dot/word_document_with_autostart_macro.dot.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Template: word_document.dot Last Saved By: schulung Revision Number: 2 Name of Creating Application: Microsoft Office Word Create Time/Date: Fri Mar 11 10:27:00 2016 Last Saved Time/Date: Fri Mar 11 10:27:00 2016 Number of Pages: 1 Number of Words: 33 Number of Characters: 210 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Template: word_document.dot, Last Saved By: schulung, Revision Number: 2, Name of Creating Application: Microsoft Office Word, Create Time/Date: Fri Mar 11 10:27:00 2016, Last Saved Time/Date: Fri Mar 11 10:27:00 2016, Number of Pages: 1, Number of Words: 33, Number of Characters: 210, Security: 0 diff --git a/tests/file-tests/reference/dump/big-endian-dump.ref b/tests/file-tests/reference/dump/big-endian-dump.ref deleted file mode 100644 index 63c353c..0000000 --- a/tests/file-tests/reference/dump/big-endian-dump.ref +++ /dev/null @@ -1 +0,0 @@ -new-fs dump file (big endian) This dump Mon Sep 24 07:53:12 2012 Previous dump Thu Jan 1 00:00:00 1970 Volume 1 Level zero type: tape header Label myext3fs Filesystem /mnt/myext3fs Device /dev/loop0 Host unknown.host.on.unknown.domain.com Flags 3 diff --git a/tests/file-tests/reference/elf/a.ref b/tests/file-tests/reference/elf/a.ref index 624d963..c67639c 100644 --- a/tests/file-tests/reference/elf/a.ref +++ b/tests/file-tests/reference/elf/a.ref @@ -1 +1 @@ -ELF 64-bit LSB executable x86-64 version 1 (SYSV) dynamically linked interpreter /lib64/ld-linux-x86-64.so.2 for GNU/Linux 2.6.32 BuildID[sha1]=f382d7105a1c1d2b42db80c4202ea7a84c59b335 not stripped +ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.32, BuildID[sha1]=f382d7105a1c1d2b42db80c4202ea7a84c59b335, not stripped diff --git a/tests/file-tests/reference/elf/filter.ref b/tests/file-tests/reference/elf/filter.ref index f3db28f..9976037 100644 --- a/tests/file-tests/reference/elf/filter.ref +++ b/tests/file-tests/reference/elf/filter.ref @@ -1 +1 @@ -ELF 64-bit MSB executable IBM S/390 version 1 (SYSV) dynamically linked interpreter *empty* with debug_info not stripped +ELF 64-bit MSB executable, IBM S/390, version 1 (SYSV), dynamically linked, interpreter *empty*, with debug_info, not stripped diff --git a/tests/file-tests/reference/elf/hello-aarch64-executable.ref b/tests/file-tests/reference/elf/hello-aarch64-executable.ref index dea313a..cbf4179 100644 --- a/tests/file-tests/reference/elf/hello-aarch64-executable.ref +++ b/tests/file-tests/reference/elf/hello-aarch64-executable.ref @@ -1 +1 @@ -ELF 64-bit LSB executable ARM aarch64 version 1 (SYSV) dynamically linked interpreter /lib/ld-linux-aarch64.so.1 for GNU/Linux 2.6.39 with debug_info not stripped +ELF 64-bit LSB executable, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-aarch64.so.1, for GNU/Linux 2.6.39, with debug_info, not stripped diff --git a/tests/file-tests/reference/elf/library-now.so.ref b/tests/file-tests/reference/elf/library-now.so.ref index b79bf9a..6809c69 100644 --- a/tests/file-tests/reference/elf/library-now.so.ref +++ b/tests/file-tests/reference/elf/library-now.so.ref @@ -1 +1 @@ -ELF 64-bit LSB shared object x86-64 version 1 (SYSV) dynamically linked for NetBSD 7.99.59 not stripped +ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, for NetBSD 7.99.59, not stripped diff --git a/tests/file-tests/reference/elf/library.so.ref b/tests/file-tests/reference/elf/library.so.ref deleted file mode 100644 index caacb03..0000000 --- a/tests/file-tests/reference/elf/library.so.ref +++ /dev/null @@ -1 +0,0 @@ -ELF 64-bit LSB pie executable x86-64 version 1 (SYSV) dynamically linked for NetBSD 7.99.59 not stripped diff --git a/tests/file-tests/reference/elf/new-keyctl.debug.ref b/tests/file-tests/reference/elf/new-keyctl.debug.ref index c6c1fad..d22ac20 100644 --- a/tests/file-tests/reference/elf/new-keyctl.debug.ref +++ b/tests/file-tests/reference/elf/new-keyctl.debug.ref @@ -1 +1 @@ -ELF 64-bit MSB executable 64-bit PowerPC or cisco 7500 version 1 (SYSV) dynamically linked interpreter *empty* for GNU/Linux 2.6.18 BuildID[sha1]=d9f5c8e0529a1ab1246b3e3cad6de000f302d81f with debug_info not stripped +ELF 64-bit MSB executable, 64-bit PowerPC or cisco 7500, Unspecified or Power ELF V1 ABI, version 1 (SYSV), dynamically linked, interpreter *empty*, for GNU/Linux 2.6.18, BuildID[sha1]=d9f5c8e0529a1ab1246b3e3cad6de000f302d81f, with debug_info, not stripped diff --git a/tests/file-tests/reference/elf/old-keyctl.debug.ref b/tests/file-tests/reference/elf/old-keyctl.debug.ref index 743f6c2..0224967 100644 --- a/tests/file-tests/reference/elf/old-keyctl.debug.ref +++ b/tests/file-tests/reference/elf/old-keyctl.debug.ref @@ -1 +1 @@ -ELF 64-bit MSB executable 64-bit PowerPC or cisco 7500 version 1 (SYSV) dynamically linked interpreter *empty* for GNU/Linux 2.6.18 BuildID[sha1]=9071f87f5884ead2e7127a8c8c72061bfb8c115c with debug_info not stripped +ELF 64-bit MSB executable, 64-bit PowerPC or cisco 7500, Unspecified or Power ELF V1 ABI, version 1 (SYSV), dynamically linked, interpreter *empty*, for GNU/Linux 2.6.18, BuildID[sha1]=9071f87f5884ead2e7127a8c8c72061bfb8c115c, with debug_info, not stripped diff --git a/tests/file-tests/reference/elf/pie-now.out.ref b/tests/file-tests/reference/elf/pie-now.out.ref deleted file mode 100644 index 9aa5610..0000000 --- a/tests/file-tests/reference/elf/pie-now.out.ref +++ /dev/null @@ -1 +0,0 @@ -ELF 64-bit LSB pie executable x86-64 version 1 (SYSV) dynamically linked interpreter /usr/libexec/ld.elf_so for NetBSD 7.99.59 not stripped diff --git a/tests/file-tests/reference/elf/pie-test.ref b/tests/file-tests/reference/elf/pie-test.ref index d756540..a04f2a9 100644 --- a/tests/file-tests/reference/elf/pie-test.ref +++ b/tests/file-tests/reference/elf/pie-test.ref @@ -1 +1 @@ -POSIX shell script ASCII text executable +POSIX shell script, ASCII text executable diff --git a/tests/file-tests/reference/elf/pie.out.ref b/tests/file-tests/reference/elf/pie.out.ref deleted file mode 100644 index 9aa5610..0000000 --- a/tests/file-tests/reference/elf/pie.out.ref +++ /dev/null @@ -1 +0,0 @@ -ELF 64-bit LSB pie executable x86-64 version 1 (SYSV) dynamically linked interpreter /usr/libexec/ld.elf_so for NetBSD 7.99.59 not stripped diff --git a/tests/file-tests/reference/elf/ppm.ref b/tests/file-tests/reference/elf/ppm.ref index f3db28f..9976037 100644 --- a/tests/file-tests/reference/elf/ppm.ref +++ b/tests/file-tests/reference/elf/ppm.ref @@ -1 +1 @@ -ELF 64-bit MSB executable IBM S/390 version 1 (SYSV) dynamically linked interpreter *empty* with debug_info not stripped +ELF 64-bit MSB executable, IBM S/390, version 1 (SYSV), dynamically linked, interpreter *empty*, with debug_info, not stripped diff --git a/tests/file-tests/reference/filesystems/bootsector.ref b/tests/file-tests/reference/filesystems/bootsector.ref index 05eda4c..c4c0282 100644 --- a/tests/file-tests/reference/filesystems/bootsector.ref +++ b/tests/file-tests/reference/filesystems/bootsector.ref @@ -1 +1 @@ -DOS/MBR boot sector; partition 1 : ID=0x8e start-CHS (0x3ff25463) end-CHS (0x3ff25463) startsector 2048 841519104 sectors; partition 2 : ID=0x5 start-CHS (0x3ff25463) end-CHS (0x3ff25463) startsector 841521152 29363265 sectors extended partition table +DOS/MBR boot sector; partition 1 : ID=0x8e, start-CHS (0x3ff,254,63), end-CHS (0x3ff,254,63), startsector 2048, 841519104 sectors; partition 2 : ID=0x5, start-CHS (0x3ff,254,63), end-CHS (0x3ff,254,63), startsector 841521152, 29363265 sectors, extended partition table diff --git a/tests/file-tests/reference/filesystems/ext4.ref b/tests/file-tests/reference/filesystems/ext4.ref index 12da6f5..509ef2d 100644 --- a/tests/file-tests/reference/filesystems/ext4.ref +++ b/tests/file-tests/reference/filesystems/ext4.ref @@ -1 +1 @@ -Linux rev 1.0 ext4 filesystem data UUID=9039e47a-714e-42e0-8c1f-72349406c858 (needs journal recovery) (extents) (huge files) +Linux rev 1.0 ext4 filesystem data, UUID=9039e47a-714e-42e0-8c1f-72349406c858 (needs journal recovery) (extents) (huge files) diff --git a/tests/file-tests/reference/filesystems/filetest.ref b/tests/file-tests/reference/filesystems/filetest.ref index ebf992a..9837af6 100644 --- a/tests/file-tests/reference/filesystems/filetest.ref +++ b/tests/file-tests/reference/filesystems/filetest.ref @@ -1 +1 @@ -DOS/MBR boot sector code offset 0x52+2 OEM-ID "NTFS " sectors/cluster 8 Media descriptor 0xf8 sectors/track 63 heads 255 hidden sectors 2048 dos < 4.0 BootSector (0x80) FAT (1Y bit by descriptor); NTFS sectors/track 63 sectors 104857599 $MFT start cluster 786432 $MFTMirror start cluster 6553599 bytes/RecordSegment 2^(-1*246) clusters/index block 1 serial number 0c206ec5806ec4ecb; containsMicrosoft Windows XP/VISTA bootloader NTLDR +DOS/MBR boot sector, code offset 0x52+2, OEM-ID "NTFS ", sectors/cluster 8, Media descriptor 0xf8, sectors/track 63, heads 255, hidden sectors 2048, dos < 4.0 BootSector (0x80), FAT (1Y bit by descriptor); NTFS, sectors/track 63, sectors 104857599, $MFT start cluster 786432, $MFTMirror start cluster 6553599, bytes/RecordSegment 2^(-1*246), clusters/index block 1, serial number 0c206ec5806ec4ecb; contains bootstrap NTLDR diff --git a/tests/file-tests/reference/filesystems/lvm2.ref b/tests/file-tests/reference/filesystems/lvm2.ref index 7cb63fd..19f53b7 100644 --- a/tests/file-tests/reference/filesystems/lvm2.ref +++ b/tests/file-tests/reference/filesystems/lvm2.ref @@ -1 +1 @@ -LVM2 PV (Linux Logical Volume Manager) UUID: oIvZLq-CrTz-QbWq-AgyH-j15b-JmZg-IxcQs3 size: 430857781248 +LVM2 PV (Linux Logical Volume Manager), UUID: oIvZLq-CrTz-QbWq-AgyH-j15b-JmZg-IxcQs3, size: 430857781248 diff --git a/tests/file-tests/reference/filesystems/ntfs.ref b/tests/file-tests/reference/filesystems/ntfs.ref index 12da6f5..509ef2d 100644 --- a/tests/file-tests/reference/filesystems/ntfs.ref +++ b/tests/file-tests/reference/filesystems/ntfs.ref @@ -1 +1 @@ -Linux rev 1.0 ext4 filesystem data UUID=9039e47a-714e-42e0-8c1f-72349406c858 (needs journal recovery) (extents) (huge files) +Linux rev 1.0 ext4 filesystem data, UUID=9039e47a-714e-42e0-8c1f-72349406c858 (needs journal recovery) (extents) (huge files) diff --git a/tests/file-tests/reference/filesystems/swap-ia64.ref b/tests/file-tests/reference/filesystems/swap-ia64.ref index 62c99d1..676a52a 100644 --- a/tests/file-tests/reference/filesystems/swap-ia64.ref +++ b/tests/file-tests/reference/filesystems/swap-ia64.ref @@ -1 +1 @@ -Linux/ia64 swap file +Linux swap file, 16k page size, little endian, version 1, size 63 pages, 0 bad pages, no label, UUID=00000000-0000-0000-0000-000000000000 diff --git a/tests/file-tests/reference/filesystems/swap-ppc.ref b/tests/file-tests/reference/filesystems/swap-ppc.ref index b7ddd59..e88b70b 100644 --- a/tests/file-tests/reference/filesystems/swap-ppc.ref +++ b/tests/file-tests/reference/filesystems/swap-ppc.ref @@ -1 +1 @@ -Linux/ppc swap file version 16777216 size 184549376 pages no label UUID=00000000-0000-0000-0000-000000000000 +Linux swap file, 64k page size, big endian, version 1, size 11 pages, 0 bad pages, no label, UUID=00000000-0000-0000-0000-000000000000 diff --git a/tests/file-tests/reference/frm/help_relation.frm.ref b/tests/file-tests/reference/frm/help_relation.frm.ref index f5bae01..02720d7 100644 --- a/tests/file-tests/reference/frm/help_relation.frm.ref +++ b/tests/file-tests/reference/frm/help_relation.frm.ref @@ -1 +1 @@ -MySQL table definition file Version 9 type MYISAM MySQL version 50146 +MySQL table definition file Version 9, type MYISAM, MySQL version 50146 diff --git a/tests/file-tests/reference/gif/1.gif.ref b/tests/file-tests/reference/gif/1.gif.ref index 2365fb7..477c950 100644 --- a/tests/file-tests/reference/gif/1.gif.ref +++ b/tests/file-tests/reference/gif/1.gif.ref @@ -1 +1 @@ -GIF image data version 89a 39 x 46 +GIF image data, version 89a, 39 x 46 diff --git a/tests/file-tests/reference/gz/a.gz.ref b/tests/file-tests/reference/gz/a.gz.ref index abd35e6..c5b5873 100644 --- a/tests/file-tests/reference/gz/a.gz.ref +++ b/tests/file-tests/reference/gz/a.gz.ref @@ -1 +1 @@ -gzip compressed data was "\377\377\377\377.3" original size 4763 +gzip compressed data, was "\377\377\377\377.3", original size modulo 2^32 4763 diff --git a/tests/file-tests/reference/gz/abc1.gz.ref b/tests/file-tests/reference/gz/abc1.gz.ref index 62f965c..770d846 100644 --- a/tests/file-tests/reference/gz/abc1.gz.ref +++ b/tests/file-tests/reference/gz/abc1.gz.ref @@ -1 +1 @@ -gzip compressed data was "abc1" last modified: Mon May 7 22:58:26 2007 from Unix original size 0 +gzip compressed data, was "abc1", last modified: Mon May 7 22:58:26 2007, from Unix, truncated diff --git a/tests/file-tests/reference/gz/abc2.gz.ref b/tests/file-tests/reference/gz/abc2.gz.ref index 9f2906f..46b67e2 100644 --- a/tests/file-tests/reference/gz/abc2.gz.ref +++ b/tests/file-tests/reference/gz/abc2.gz.ref @@ -1 +1 @@ -gzip compressed data was "abc2" last modified: Mon May 7 22:58:26 2007 from Unix original size 0 +gzip compressed data, was "abc2", last modified: Mon May 7 22:58:26 2007, from Unix, truncated diff --git a/tests/file-tests/reference/h/a.h.ref b/tests/file-tests/reference/h/a.h.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/h/a.h.ref +++ b/tests/file-tests/reference/h/a.h.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/h/basic_string.h.ref b/tests/file-tests/reference/h/basic_string.h.ref index fc824ca..2316075 100644 --- a/tests/file-tests/reference/h/basic_string.h.ref +++ b/tests/file-tests/reference/h/basic_string.h.ref @@ -1 +1 @@ -C++ source ASCII text +C++ source, ASCII text diff --git a/tests/file-tests/reference/h/gclosure.h.ref b/tests/file-tests/reference/h/gclosure.h.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/h/gclosure.h.ref +++ b/tests/file-tests/reference/h/gclosure.h.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/h/gfile.h.ref b/tests/file-tests/reference/h/gfile.h.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/h/gfile.h.ref +++ b/tests/file-tests/reference/h/gfile.h.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/h/gfileattribute.h.ref b/tests/file-tests/reference/h/gfileattribute.h.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/h/gfileattribute.h.ref +++ b/tests/file-tests/reference/h/gfileattribute.h.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/h/gsocketaddressenumerator.h.ref b/tests/file-tests/reference/h/gsocketaddressenumerator.h.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/h/gsocketaddressenumerator.h.ref +++ b/tests/file-tests/reference/h/gsocketaddressenumerator.h.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/h/gunixmounts.h.ref b/tests/file-tests/reference/h/gunixmounts.h.ref index 77262c8..8238e6c 100644 --- a/tests/file-tests/reference/h/gunixmounts.h.ref +++ b/tests/file-tests/reference/h/gunixmounts.h.ref @@ -1 +1 @@ -C source ASCII text +C source, ASCII text diff --git a/tests/file-tests/reference/h/stl_map.h.ref b/tests/file-tests/reference/h/stl_map.h.ref index fc824ca..2316075 100644 --- a/tests/file-tests/reference/h/stl_map.h.ref +++ b/tests/file-tests/reference/h/stl_map.h.ref @@ -1 +1 @@ -C++ source ASCII text +C++ source, ASCII text diff --git a/tests/file-tests/reference/h/stl_queue.h.ref b/tests/file-tests/reference/h/stl_queue.h.ref index fc824ca..2316075 100644 --- a/tests/file-tests/reference/h/stl_queue.h.ref +++ b/tests/file-tests/reference/h/stl_queue.h.ref @@ -1 +1 @@ -C++ source ASCII text +C++ source, ASCII text diff --git a/tests/file-tests/reference/h/stl_stack.h.ref b/tests/file-tests/reference/h/stl_stack.h.ref index fc824ca..2316075 100644 --- a/tests/file-tests/reference/h/stl_stack.h.ref +++ b/tests/file-tests/reference/h/stl_stack.h.ref @@ -1 +1 @@ -C++ source ASCII text +C++ source, ASCII text diff --git a/tests/file-tests/reference/hlp/biochlr2.hlp.ref b/tests/file-tests/reference/hlp/biochlr2.hlp.ref index 45ab22b..b1e1504 100644 --- a/tests/file-tests/reference/hlp/biochlr2.hlp.ref +++ b/tests/file-tests/reference/hlp/biochlr2.hlp.ref @@ -1 +1 @@ -MS Windows help Bookmark 1051272 bytes +MS Windows help Bookmark, 1051272 bytes diff --git a/tests/file-tests/reference/hta/access.hta.ref b/tests/file-tests/reference/hta/access.hta.ref index 62d87d7..0258011 100644 --- a/tests/file-tests/reference/hta/access.hta.ref +++ b/tests/file-tests/reference/hta/access.hta.ref @@ -1 +1 @@ -HTML document ASCII text +HTML document, ASCII text diff --git a/tests/file-tests/reference/hta/hello_world.hta.ref b/tests/file-tests/reference/hta/hello_world.hta.ref index 62d87d7..0258011 100644 --- a/tests/file-tests/reference/hta/hello_world.hta.ref +++ b/tests/file-tests/reference/hta/hello_world.hta.ref @@ -1 +1 @@ -HTML document ASCII text +HTML document, ASCII text diff --git a/tests/file-tests/reference/html/index_first4k.html.ref b/tests/file-tests/reference/html/index_first4k.html.ref index 77fcf2a..404cc4b 100644 --- a/tests/file-tests/reference/html/index_first4k.html.ref +++ b/tests/file-tests/reference/html/index_first4k.html.ref @@ -1 +1 @@ -HTML document UTF-8 Unicode text +HTML document, Unicode text, UTF-8 text diff --git a/tests/file-tests/reference/icm/bluish.icc.ref b/tests/file-tests/reference/icm/bluish.icc.ref index d6e9fcf..8ef9d89 100644 --- a/tests/file-tests/reference/icm/bluish.icc.ref +++ b/tests/file-tests/reference/icm/bluish.icc.ref @@ -1 +1 @@ -Microsoft color profile 2.1 type argl RGB/XYZ-mntr device IEC/sRGB model by HP 3966 bytes 9-2-1998 6:49:00 "Blueish Test" +Microsoft color profile 2.1, type argl, RGB/XYZ-mntr device, IEC/sRGB model by HP, 3966 bytes, 9-2-1998 6:49:00 "Blueish Test" diff --git a/tests/file-tests/reference/icm/sRGB.icm.ref b/tests/file-tests/reference/icm/sRGB.icm.ref index aa0cc0b..26d3b0e 100644 --- a/tests/file-tests/reference/icm/sRGB.icm.ref +++ b/tests/file-tests/reference/icm/sRGB.icm.ref @@ -1 +1 @@ -ColorSync color profile 2.3 type lcms RGB/XYZ-mntr device by lcms 7236 bytes 6-1-2010 12:47:17 "sRGB IEC61966-2.1" +ColorSync color profile 2.3, type lcms, RGB/XYZ-mntr device by lcms, 7236 bytes, 6-1-2010 12:47:17 "sRGB IEC61966-2.1" diff --git a/tests/file-tests/reference/ico/pixel-install.ico.ref b/tests/file-tests/reference/ico/pixel-install.ico.ref index a106ba0..e5716fb 100644 --- a/tests/file-tests/reference/ico/pixel-install.ico.ref +++ b/tests/file-tests/reference/ico/pixel-install.ico.ref @@ -1 +1 @@ -MS Windows icon resource - 3 icons 16x16 8 bits/pixel 24x24 8 bits/pixel +MS Windows icon resource - 3 icons, 16x16, 8 bits/pixel, 24x24, 8 bits/pixel diff --git a/tests/file-tests/reference/img/initrd1.img.ref b/tests/file-tests/reference/img/initrd1.img.ref index e389399..50dd39e 100644 --- a/tests/file-tests/reference/img/initrd1.img.ref +++ b/tests/file-tests/reference/img/initrd1.img.ref @@ -1 +1 @@ -LZMA compressed data streamed +LZMA compressed data, streamed diff --git a/tests/file-tests/reference/img/qcow2.img.ref b/tests/file-tests/reference/img/qcow2.img.ref deleted file mode 100644 index 18d1c83..0000000 --- a/tests/file-tests/reference/img/qcow2.img.ref +++ /dev/null @@ -1 +0,0 @@ -QEMU QCOW2 Image (v2) 1024 bytes diff --git a/tests/file-tests/reference/img/qcow2_v2.qcow2.ref b/tests/file-tests/reference/img/qcow2_v2.qcow2.ref new file mode 100644 index 0000000..0fc76bd --- /dev/null +++ b/tests/file-tests/reference/img/qcow2_v2.qcow2.ref @@ -0,0 +1 @@ +QEMU QCOW Image (v2), 1048576 bytes, AES-encrypted (v2), 1048576 bytes diff --git a/tests/file-tests/reference/img/qcow2_v3.qcow2.ref b/tests/file-tests/reference/img/qcow2_v3.qcow2.ref new file mode 100644 index 0000000..7416723 --- /dev/null +++ b/tests/file-tests/reference/img/qcow2_v3.qcow2.ref @@ -0,0 +1 @@ +QEMU QCOW Image (v3), 1048576 bytes, AES-encrypted (v3), 1048576 bytes diff --git a/tests/file-tests/reference/img/qcow_v1.qcow.ref b/tests/file-tests/reference/img/qcow_v1.qcow.ref new file mode 100644 index 0000000..4ea48c5 --- /dev/null +++ b/tests/file-tests/reference/img/qcow_v1.qcow.ref @@ -0,0 +1 @@ +QEMU QCOW Image (v1), 1048576 bytes diff --git a/tests/file-tests/reference/img/vdi.img.ref b/tests/file-tests/reference/img/vdi.img.ref index 05fa65f..5bf2cf3 100644 --- a/tests/file-tests/reference/img/vdi.img.ref +++ b/tests/file-tests/reference/img/vdi.img.ref @@ -1 +1 @@ -VirtualBox Disk Image major 1 minor 1 (<<< QEMU VM Virtual Disk Image >>>) 1024 bytes +VirtualBox Disk Image, major 1, minor 1 (<<< QEMU VM Virtual Disk Image >>>), 1024 bytes diff --git a/tests/file-tests/reference/ins/setup.ins.ref b/tests/file-tests/reference/ins/setup.ins.ref index b03cd42..1fda628 100644 --- a/tests/file-tests/reference/ins/setup.ins.ref +++ b/tests/file-tests/reference/ins/setup.ins.ref @@ -1 +1 @@ -COM executable for DOS +InstallShield Script "InstallSHIELD Software Coporation (c) 1990-1997", variable names: #0 SRCDIR #1 SRCDISK #2 TARGETDISK ... diff --git a/tests/file-tests/reference/iso/x.iso.ref b/tests/file-tests/reference/iso/x.iso.ref index bc7c836..6a3c6a6 100644 --- a/tests/file-tests/reference/iso/x.iso.ref +++ b/tests/file-tests/reference/iso/x.iso.ref @@ -1 +1 @@ -DOS/MBR boot sector; partition 1 : ID=0x17 active start-CHS (0x001) end-CHS (0x2c76332) startsector 0 1458176 sectors +ISO 9660 CD-ROM filesystem data (DOS/MBR boot sector) 'testday-20110324' (bootable) diff --git a/tests/file-tests/reference/java/CreateMdb.java.ref b/tests/file-tests/reference/java/CreateMdb.java.ref index fc824ca..2316075 100644 --- a/tests/file-tests/reference/java/CreateMdb.java.ref +++ b/tests/file-tests/reference/java/CreateMdb.java.ref @@ -1 +1 @@ -C++ source ASCII text +C++ source, ASCII text diff --git a/tests/file-tests/reference/jpg/lime-cat.jpg.ref b/tests/file-tests/reference/jpg/lime-cat.jpg.ref index 0ac6721..2620044 100644 --- a/tests/file-tests/reference/jpg/lime-cat.jpg.ref +++ b/tests/file-tests/reference/jpg/lime-cat.jpg.ref @@ -1 +1 @@ -JPEG image data JFIF standard 1.02 resolution (DPI) density 96x96 segment length 16 Exif Standard: [TIFF image data big-endian direntries=7 orientation=upper-left xresolution=98 yresolution=106 resolutionunit=2 software=Adobe Photoshop 7.0 datetime=2004:09:11 19:46:49] +JPEG image data, JFIF standard 1.02, resolution (DPI), density 96x96, segment length 16, Exif Standard: [TIFF image data, big-endian, direntries=7, orientation=upper-left, xresolution=98, yresolution=106, resolutionunit=2, software=Adobe Photoshop 7.0, datetime=2004:09:11 19:46:49] diff --git a/tests/file-tests/reference/jpg/xsane-zoom-in.jpg.ref b/tests/file-tests/reference/jpg/xsane-zoom-in.jpg.ref deleted file mode 100644 index e99c89e..0000000 --- a/tests/file-tests/reference/jpg/xsane-zoom-in.jpg.ref +++ /dev/null @@ -1 +0,0 @@ -JPEG image data JFIF standard 1.01 resolution (DPI) density 72x72 segment length 16 comment: "Created with The GIMP" baseline precision 8 30x30 components 3 diff --git a/tests/file-tests/reference/json/1.json-keep.ref b/tests/file-tests/reference/json/1.json-keep.ref new file mode 100644 index 0000000..7d63524 --- /dev/null +++ b/tests/file-tests/reference/json/1.json-keep.ref @@ -0,0 +1 @@ +JSON text data diff --git a/tests/file-tests/reference/json/2.json-keep.ref b/tests/file-tests/reference/json/2.json-keep.ref new file mode 100644 index 0000000..7d63524 --- /dev/null +++ b/tests/file-tests/reference/json/2.json-keep.ref @@ -0,0 +1 @@ +JSON text data diff --git a/tests/file-tests/reference/json/3.json-keep.ref b/tests/file-tests/reference/json/3.json-keep.ref new file mode 100644 index 0000000..7d63524 --- /dev/null +++ b/tests/file-tests/reference/json/3.json-keep.ref @@ -0,0 +1 @@ +JSON text data diff --git a/tests/file-tests/reference/json/4.json-keep.ref b/tests/file-tests/reference/json/4.json-keep.ref new file mode 100644 index 0000000..7d63524 --- /dev/null +++ b/tests/file-tests/reference/json/4.json-keep.ref @@ -0,0 +1 @@ +JSON text data diff --git a/tests/file-tests/reference/json/5.json-keep.ref b/tests/file-tests/reference/json/5.json-keep.ref new file mode 100644 index 0000000..7d63524 --- /dev/null +++ b/tests/file-tests/reference/json/5.json-keep.ref @@ -0,0 +1 @@ +JSON text data diff --git a/tests/file-tests/reference/kernels/x86_64.ref b/tests/file-tests/reference/kernels/x86_64.ref index 4a58edd..4fb7e74 100644 --- a/tests/file-tests/reference/kernels/x86_64.ref +++ b/tests/file-tests/reference/kernels/x86_64.ref @@ -1 +1 @@ -Linux kernel x86 boot executable bzImage version 3.1.5-1.fc16.x86_64 (mockbuild@x86-05.phx2.fedoraproject.org) #1 SMP Fri Dec 9 18:11:10 UTC 201 RO-rootFS swap_dev 0x4 Normal VGA +Linux kernel x86 boot executable bzImage, version 3.1.5-1.fc16.x86_64 (mockbuild@x86-05.phx2.fedoraproject.org) #1 SMP Fri Dec 9 18:11:10 UTC 2011, RO-rootFS, swap_dev 0X4, Normal VGA diff --git a/tests/file-tests/reference/lnk/windows_link.lnk.ref b/tests/file-tests/reference/lnk/windows_link.lnk.ref deleted file mode 100644 index d3b484d..0000000 --- a/tests/file-tests/reference/lnk/windows_link.lnk.ref +++ /dev/null @@ -1 +0,0 @@ -MS Windows shortcut Item id list present Points to a file or directory Has Relative path Directory ctime=Fri Feb 17 15:01:13 2012 mtime=Tue Mar 11 12:55:57 2014 atime=Tue Mar 11 12:55:57 2014 length=4096 window=hide diff --git a/tests/file-tests/reference/locale/LC_ADDRESS.ref b/tests/file-tests/reference/locale/LC_ADDRESS.ref new file mode 100644 index 0000000..f5c05fd --- /dev/null +++ b/tests/file-tests/reference/locale/LC_ADDRESS.ref @@ -0,0 +1 @@ +glibc locale file LC_ADDRESS diff --git a/tests/file-tests/reference/locale/LC_COLLATE.ref b/tests/file-tests/reference/locale/LC_COLLATE.ref new file mode 100644 index 0000000..06795a6 --- /dev/null +++ b/tests/file-tests/reference/locale/LC_COLLATE.ref @@ -0,0 +1 @@ +glibc locale file LC_COLLATE diff --git a/tests/file-tests/reference/locale/LC_CTYPE.ref b/tests/file-tests/reference/locale/LC_CTYPE.ref new file mode 100644 index 0000000..cb0b532 --- /dev/null +++ b/tests/file-tests/reference/locale/LC_CTYPE.ref @@ -0,0 +1 @@ +glibc locale file LC_CTYPE diff --git a/tests/file-tests/reference/locale/LC_IDENTIFICATION.ref b/tests/file-tests/reference/locale/LC_IDENTIFICATION.ref new file mode 100644 index 0000000..4ea2e7b --- /dev/null +++ b/tests/file-tests/reference/locale/LC_IDENTIFICATION.ref @@ -0,0 +1 @@ +glibc locale file LC_IDENTIFICATION diff --git a/tests/file-tests/reference/locale/LC_MEASUREMENT.ref b/tests/file-tests/reference/locale/LC_MEASUREMENT.ref new file mode 100644 index 0000000..0c2ffe5 --- /dev/null +++ b/tests/file-tests/reference/locale/LC_MEASUREMENT.ref @@ -0,0 +1 @@ +glibc locale file LC_MEASUREMENT diff --git a/tests/file-tests/reference/locale/LC_MONETARY.ref b/tests/file-tests/reference/locale/LC_MONETARY.ref new file mode 100644 index 0000000..6632f0c --- /dev/null +++ b/tests/file-tests/reference/locale/LC_MONETARY.ref @@ -0,0 +1 @@ +glibc locale file LC_MONETARY diff --git a/tests/file-tests/reference/locale/LC_NAME.ref b/tests/file-tests/reference/locale/LC_NAME.ref new file mode 100644 index 0000000..0599531 --- /dev/null +++ b/tests/file-tests/reference/locale/LC_NAME.ref @@ -0,0 +1 @@ +glibc locale file LC_NAME diff --git a/tests/file-tests/reference/locale/LC_NUMERIC.ref b/tests/file-tests/reference/locale/LC_NUMERIC.ref new file mode 100644 index 0000000..a52c22b --- /dev/null +++ b/tests/file-tests/reference/locale/LC_NUMERIC.ref @@ -0,0 +1 @@ +glibc locale file LC_NUMERIC diff --git a/tests/file-tests/reference/locale/LC_PAPER.ref b/tests/file-tests/reference/locale/LC_PAPER.ref new file mode 100644 index 0000000..2532124 --- /dev/null +++ b/tests/file-tests/reference/locale/LC_PAPER.ref @@ -0,0 +1 @@ +glibc locale file LC_PAPER diff --git a/tests/file-tests/reference/locale/LC_TELEPHONE.ref b/tests/file-tests/reference/locale/LC_TELEPHONE.ref new file mode 100644 index 0000000..319a64a --- /dev/null +++ b/tests/file-tests/reference/locale/LC_TELEPHONE.ref @@ -0,0 +1 @@ +glibc locale file LC_TELEPHONE diff --git a/tests/file-tests/reference/locale/LC_TIME.ref b/tests/file-tests/reference/locale/LC_TIME.ref new file mode 100644 index 0000000..3dc1f48 --- /dev/null +++ b/tests/file-tests/reference/locale/LC_TIME.ref @@ -0,0 +1 @@ +glibc locale file LC_TIME diff --git a/tests/file-tests/reference/lsm/sysstate.lsm.ref b/tests/file-tests/reference/lsm/sysstate.lsm.ref index f651fc8..43b46c2 100644 --- a/tests/file-tests/reference/lsm/sysstate.lsm.ref +++ b/tests/file-tests/reference/lsm/sysstate.lsm.ref @@ -1 +1 @@ -Linux Software Map entry text (new format) ASCII text +Linux Software Map entry text (new format), ASCII text diff --git a/tests/file-tests/reference/mach-o/PythonLauncher.ref b/tests/file-tests/reference/mach-o/PythonLauncher.ref deleted file mode 100644 index debf4b9..0000000 --- a/tests/file-tests/reference/mach-o/PythonLauncher.ref +++ /dev/null @@ -1 +0,0 @@ -Mach-O universal binary with 2 architectures: [i386:Mach-O i386 executable flags:] [ppc:Mach-O ppc executable flags:] diff --git a/tests/file-tests/reference/misc/ansi2knr.ref b/tests/file-tests/reference/misc/ansi2knr.ref index 0d22c2a..e0e29a5 100644 --- a/tests/file-tests/reference/misc/ansi2knr.ref +++ b/tests/file-tests/reference/misc/ansi2knr.ref @@ -1 +1 @@ -troff or preprocessor input ASCII text +troff or preprocessor input, ASCII text diff --git a/tests/file-tests/reference/misc/core.ref b/tests/file-tests/reference/misc/core.ref index 95fd8e5..7b4b5a8 100644 --- a/tests/file-tests/reference/misc/core.ref +++ b/tests/file-tests/reference/misc/core.ref @@ -1 +1 @@ -ELF 64-bit LSB core file x86-64 version 1 (SYSV) SVR4-style from 'sleep 20' real uid: 501 effective uid: 501 real gid: 501 effective gid: 501 execfn: '/bin/sleep' platform: 'x86_64' +ELF 64-bit LSB core file, x86-64, version 1 (SYSV), SVR4-style, from 'sleep 20', real uid: 501, effective uid: 501, real gid: 501, effective gid: 501, execfn: '/bin/sleep', platform: 'x86_64' diff --git a/tests/file-tests/reference/misc/core2.ref b/tests/file-tests/reference/misc/core2.ref index cf60334..c546ae2 100644 --- a/tests/file-tests/reference/misc/core2.ref +++ b/tests/file-tests/reference/misc/core2.ref @@ -1 +1 @@ -ELF 32-bit MSB core file SPARC version 1 (SYSV) too many program headers (13508) +ELF 32-bit MSB core file, SPARC, version 1 (SYSV), too many program headers (13508) diff --git a/tests/file-tests/reference/misc/mysql-bin-replication-log.ref b/tests/file-tests/reference/misc/mysql-bin-replication-log.ref index e70ff3c..09dbe40 100644 --- a/tests/file-tests/reference/misc/mysql-bin-replication-log.ref +++ b/tests/file-tests/reference/misc/mysql-bin-replication-log.ref @@ -1 +1 @@ -MySQL replication log server id 1 MySQL V5+ server version 5.1.48-log +MySQL replication log, server id 1 MySQL V5+, server version 5.1.48-log diff --git a/tests/file-tests/reference/misc/openvpn.ref b/tests/file-tests/reference/misc/openvpn.ref index d756540..a04f2a9 100644 --- a/tests/file-tests/reference/misc/openvpn.ref +++ b/tests/file-tests/reference/misc/openvpn.ref @@ -1 +1 @@ -POSIX shell script ASCII text executable +POSIX shell script, ASCII text executable diff --git a/tests/file-tests/reference/mng/jabber_connecting.mng.ref b/tests/file-tests/reference/mng/jabber_connecting.mng.ref index 0fdc7c0..2e0592b 100644 --- a/tests/file-tests/reference/mng/jabber_connecting.mng.ref +++ b/tests/file-tests/reference/mng/jabber_connecting.mng.ref @@ -1 +1 @@ -MNG video data 16 x 16 +MNG video data, 16 x 16 diff --git a/tests/file-tests/reference/mo/a.mo.ref b/tests/file-tests/reference/mo/a.mo.ref index deed576..4282c4c 100644 --- a/tests/file-tests/reference/mo/a.mo.ref +++ b/tests/file-tests/reference/mo/a.mo.ref @@ -1 +1 @@ -GNU message catalog (little endian) revision 0.0 141 messages Project-Id-Version: setroubleshoot-framework ' \340\252\252\340\253\202\340\252\260\340\252\276 SELinux \340\252\270\340\252\202\340\252\246\340\253\207\340\252\266\340\252\276\340\252\223 \340\252\256\340\252\276\340\252\237\340\253\207. sealert -l %s \340\252\232\340\252\262\340\252\276\340\252\265\340\253\213' +GNU message catalog (little endian), revision 0.0, 141 messages, Project-Id-Version: setroubleshoot-framework ' \340\252\252\340\253\202\340\252\260\340\252\276 SELinux \340\252\270\340\252\202\340\252\246\340\253\207\340\252\266\340\252\276\340\252\223 \340\252\256\340\252\276\340\252\237\340\253\207. sealert -l %s \340\252\232\340\252\262\340\252\276\340\252\265\340\253\213' diff --git a/tests/file-tests/reference/mono/Mono.TextTemplating.dll.ref b/tests/file-tests/reference/mono/Mono.TextTemplating.dll.ref index f89de9b..bf97b49 100644 --- a/tests/file-tests/reference/mono/Mono.TextTemplating.dll.ref +++ b/tests/file-tests/reference/mono/Mono.TextTemplating.dll.ref @@ -1 +1 @@ -PE32 executable (DLL) (console) Intel 80386 Mono/.Net assembly for MS Windows +PE32 executable (DLL) (console) Intel 80386 Mono/.Net assembly, for MS Windows diff --git a/tests/file-tests/reference/mono/TextTransform.exe.ref b/tests/file-tests/reference/mono/TextTransform.exe.ref index e596890..59cee2f 100644 --- a/tests/file-tests/reference/mono/TextTransform.exe.ref +++ b/tests/file-tests/reference/mono/TextTransform.exe.ref @@ -1 +1 @@ -PE32 executable (console) Intel 80386 Mono/.Net assembly for MS Windows +PE32 executable (console) Intel 80386 Mono/.Net assembly, for MS Windows diff --git a/tests/file-tests/reference/mp3/house_lo.mp3.ref b/tests/file-tests/reference/mp3/house_lo.mp3.ref index f558f9c..f2b1b63 100644 --- a/tests/file-tests/reference/mp3/house_lo.mp3.ref +++ b/tests/file-tests/reference/mp3/house_lo.mp3.ref @@ -1 +1 @@ -MPEG ADTS layer III v2.5 128 kbps 11.025 kHz Monaural +MPEG ADTS, layer III, v2.5, 128 kbps, 11.025 kHz, Monaural diff --git a/tests/file-tests/reference/msc/ms_management_console.msc.ref b/tests/file-tests/reference/msc/ms_management_console.msc.ref index f470bed..d6e9450 100644 --- a/tests/file-tests/reference/msc/ms_management_console.msc.ref +++ b/tests/file-tests/reference/msc/ms_management_console.msc.ref @@ -1 +1 @@ -XML 1.0 document ASCII text +XML 1.0 document, ASCII text diff --git a/tests/file-tests/reference/msi/SampleFirst_full.msi.ref b/tests/file-tests/reference/msi/SampleFirst_full.msi.ref index dcabd1a..faad2e8 100644 --- a/tests/file-tests/reference/msi/SampleFirst_full.msi.ref +++ b/tests/file-tests/reference/msi/SampleFirst_full.msi.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 5.1 MSI Installer Code page: 1252 Title: Installation Database Subject: Acme's Foobar 1.0 Installer Author: file-test creator Keywords: Installer Comments: created following http://wix.tramontana.co.hu/tutorial Template: Intel;1033 Revision Number: {F6B1C691-4136-4489-AD6A-DFE142735E4B} Create Time/Date: Mon Mar 24 11:00:28 2014 Last Saved Time/Date: Mon Mar 24 11:00:28 2014 Number of Pages: 100 Number of Words: 2 Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0) Security: 2 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, MSI Installer, Code page: 1252, Title: Installation Database, Subject: Acme's Foobar 1.0 Installer, Author: file-test creator, Keywords: Installer, Comments: created following http://wix.tramontana.co.hu/tutorial, Template: Intel;1033, Revision Number: {F6B1C691-4136-4489-AD6A-DFE142735E4B}, Create Time/Date: Mon Mar 24 11:00:28 2014, Last Saved Time/Date: Mon Mar 24 11:00:28 2014, Number of Pages: 100, Number of Words: 2, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 2 diff --git a/tests/file-tests/reference/msp/Patch_full.msp.ref b/tests/file-tests/reference/msp/Patch_full.msp.ref index f904013..4149f45 100644 --- a/tests/file-tests/reference/msp/Patch_full.msp.ref +++ b/tests/file-tests/reference/msp/Patch_full.msp.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 5.1 Code page: 1252 Title: Installation Database Subject: Acme's Foobar 1.0 Installer Author: Acme Ltd. Keywords: Installer Comments: Foobar is a registered trademark of Acme Ltd. Create Time/Date: Mon Mar 24 11:33:32 2014 Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0) Security: 4 Template: Intel;1033 Last Saved By: Intel;1033 Revision Number: {3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}1.0.0;{3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}1.0.0;{11799D66-3206-495E-AA87-901734ECDAEA} Number of Pages: 100 Number of Characters: 153223199 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Code page: 1252, Title: Installation Database, Subject: Acme's Foobar 1.0 Installer, Author: Acme Ltd., Keywords: Installer, Comments: Foobar is a registered trademark of Acme Ltd., Create Time/Date: Mon Mar 24 11:33:32 2014, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 4, Template: Intel;1033, Last Saved By: Intel;1033, Revision Number: {3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}1.0.0;{3D9F6ADC-CBB9-4EE4-949F-CA8BCFDB8255}1.0.0;{11799D66-3206-495E-AA87-901734ECDAEA}, Number of Pages: 100, Number of Characters: 153223199 diff --git a/tests/file-tests/reference/mst/wix_transform_full.mst.ref b/tests/file-tests/reference/mst/wix_transform_full.mst.ref index e26b5b5..8b75111 100644 --- a/tests/file-tests/reference/mst/wix_transform_full.mst.ref +++ b/tests/file-tests/reference/mst/wix_transform_full.mst.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 5.1 Code page: 1250 Title: Installation Database Subject: Acme's Foobar 1.0 Installer Author: Acme Ltd. Keywords: Installer Comments: Foobar is a registered trademark of Acme Ltd. Create Time/Date: Mon Mar 24 12:02:34 2014 Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0) Security: 4 Template: Intel;1033 Last Saved By: Intel;1033 Revision Number: {26FB1AB6-7195-4B92-9751-F1B6226CBA34}1.0.0;{26FB1AB6-7195-4B92-9751-F1B6226CBA34}1.0.0;{3F2782EF-47A2-4602-B6B4-4ECD17E98294} Number of Pages: 100 Number of Characters: 131135 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 5.1, Code page: 1250, Title: Installation Database, Subject: Acme's Foobar 1.0 Installer, Author: Acme Ltd., Keywords: Installer, Comments: Foobar is a registered trademark of Acme Ltd., Create Time/Date: Mon Mar 24 12:02:34 2014, Name of Creating Application: Windows Installer XML Toolset (3.8.1128.0), Security: 4, Template: Intel;1033, Last Saved By: Intel;1033, Revision Number: {26FB1AB6-7195-4B92-9751-F1B6226CBA34}1.0.0;{26FB1AB6-7195-4B92-9751-F1B6226CBA34}1.0.0;{3F2782EF-47A2-4602-B6B4-4ECD17E98294}, Number of Pages: 100, Number of Characters: 131135 diff --git a/tests/file-tests/reference/myi/event.MYI.ref b/tests/file-tests/reference/myi/event.MYI.ref index 9f9a450..f73d733 100644 --- a/tests/file-tests/reference/myi/event.MYI.ref +++ b/tests/file-tests/reference/myi/event.MYI.ref @@ -1 +1 @@ -MySQL MyISAM index file Version 1 2 key parts 0 unique key parts 1 keys 0 records 0 deleted records +MySQL MyISAM index file Version 1, 2 key parts, 0 unique key parts, 1 keys, 0 records, 0 deleted records diff --git a/tests/file-tests/reference/ogg/fiba1.ogg.ref b/tests/file-tests/reference/ogg/fiba1.ogg.ref index 917d888..d9e6466 100644 --- a/tests/file-tests/reference/ogg/fiba1.ogg.ref +++ b/tests/file-tests/reference/ogg/fiba1.ogg.ref @@ -1 +1 @@ -Ogg data Vorbis audio stereo 44100 Hz ~112000 bps created by: Xiph.Org libVorbis I (1.1.2) +Ogg data, Vorbis audio, stereo, 44100 Hz, ~112000 bps, created by: Xiph.Org libVorbis I (1.1.2) diff --git a/tests/file-tests/reference/patch/a.patch.ref b/tests/file-tests/reference/patch/a.patch.ref index 1b64683..8fd1288 100644 --- a/tests/file-tests/reference/patch/a.patch.ref +++ b/tests/file-tests/reference/patch/a.patch.ref @@ -1 +1 @@ -unified diff output ASCII text +unified diff output, ASCII text diff --git a/tests/file-tests/reference/patch/b.patch.ref b/tests/file-tests/reference/patch/b.patch.ref index 1b64683..8fd1288 100644 --- a/tests/file-tests/reference/patch/b.patch.ref +++ b/tests/file-tests/reference/patch/b.patch.ref @@ -1 +1 @@ -unified diff output ASCII text +unified diff output, ASCII text diff --git a/tests/file-tests/reference/patch/parser571033.patch.ref b/tests/file-tests/reference/patch/parser571033.patch.ref index 1b64683..8fd1288 100644 --- a/tests/file-tests/reference/patch/parser571033.patch.ref +++ b/tests/file-tests/reference/patch/parser571033.patch.ref @@ -1 +1 @@ -unified diff output ASCII text +unified diff output, ASCII text diff --git a/tests/file-tests/reference/pbm/icontopbm-back-from-icon.pbm.ref b/tests/file-tests/reference/pbm/icontopbm-back-from-icon.pbm.ref deleted file mode 100644 index 3fadf5c..0000000 --- a/tests/file-tests/reference/pbm/icontopbm-back-from-icon.pbm.ref +++ /dev/null @@ -1 +0,0 @@ -Netpbm image data size = 112 x 100 rawbits bitmap diff --git a/tests/file-tests/reference/pcd/photo_cd.pcd.ref b/tests/file-tests/reference/pcd/photo_cd.pcd.ref index 9962778..806d5dd 100644 --- a/tests/file-tests/reference/pcd/photo_cd.pcd.ref +++ b/tests/file-tests/reference/pcd/photo_cd.pcd.ref @@ -1 +1 @@ -Kodak Photo CD image pack file landscape mode +Kodak Photo CD image pack file , landscape mode diff --git a/tests/file-tests/reference/pdf/mailman-admin.pdf.ref b/tests/file-tests/reference/pdf/mailman-admin.pdf.ref index e4b977a..6f3f940 100644 --- a/tests/file-tests/reference/pdf/mailman-admin.pdf.ref +++ b/tests/file-tests/reference/pdf/mailman-admin.pdf.ref @@ -1 +1 @@ -PDF document version 1.4 +PDF document, version 1.4 diff --git a/tests/file-tests/reference/pfb/a010013l.pfb.ref b/tests/file-tests/reference/pfb/a010013l.pfb.ref index b234680..f7b7aad 100644 --- a/tests/file-tests/reference/pfb/a010013l.pfb.ref +++ b/tests/file-tests/reference/pfb/a010013l.pfb.ref @@ -1 +1 @@ -PostScript Type 1 font program data +PostScript Type 1 font program data (URWGothicL-Book 1.06) diff --git a/tests/file-tests/reference/pif/command.pif.ref b/tests/file-tests/reference/pif/command.pif.ref index 7ded447..cb52954 100644 --- a/tests/file-tests/reference/pif/command.pif.ref +++ b/tests/file-tests/reference/pif/command.pif.ref @@ -1 +1 @@ -Windows Program Information File for C:\Temp\COMMAND.COM Windows NT-style +Windows Program Information File for C:\Temp\COMMAND.COM, Windows NT-style diff --git a/tests/file-tests/reference/pl/ConfigLocal_PM.pl.ref b/tests/file-tests/reference/pl/ConfigLocal_PM.pl.ref index 46544d8..5870f7c 100644 --- a/tests/file-tests/reference/pl/ConfigLocal_PM.pl.ref +++ b/tests/file-tests/reference/pl/ConfigLocal_PM.pl.ref @@ -1 +1 @@ -Perl5 module source ASCII text +Perl5 module source, ASCII text diff --git a/tests/file-tests/reference/pl/Makefile_PL.pl.ref b/tests/file-tests/reference/pl/Makefile_PL.pl.ref index 46544d8..5870f7c 100644 --- a/tests/file-tests/reference/pl/Makefile_PL.pl.ref +++ b/tests/file-tests/reference/pl/Makefile_PL.pl.ref @@ -1 +1 @@ -Perl5 module source ASCII text +Perl5 module source, ASCII text diff --git a/tests/file-tests/reference/pm/Find.pm.ref b/tests/file-tests/reference/pm/Find.pm.ref index 46544d8..5870f7c 100644 --- a/tests/file-tests/reference/pm/Find.pm.ref +++ b/tests/file-tests/reference/pm/Find.pm.ref @@ -1 +1 @@ -Perl5 module source ASCII text +Perl5 module source, ASCII text diff --git a/tests/file-tests/reference/pm/Html.pm.ref b/tests/file-tests/reference/pm/Html.pm.ref index 46544d8..5870f7c 100644 --- a/tests/file-tests/reference/pm/Html.pm.ref +++ b/tests/file-tests/reference/pm/Html.pm.ref @@ -1 +1 @@ -Perl5 module source ASCII text +Perl5 module source, ASCII text diff --git a/tests/file-tests/reference/pm/Select.pm.ref b/tests/file-tests/reference/pm/Select.pm.ref index 46544d8..5870f7c 100644 --- a/tests/file-tests/reference/pm/Select.pm.ref +++ b/tests/file-tests/reference/pm/Select.pm.ref @@ -1 +1 @@ -Perl5 module source ASCII text +Perl5 module source, ASCII text diff --git a/tests/file-tests/reference/png/adhoc1.png.ref b/tests/file-tests/reference/png/adhoc1.png.ref index f1ca2f1..c93ff06 100644 --- a/tests/file-tests/reference/png/adhoc1.png.ref +++ b/tests/file-tests/reference/png/adhoc1.png.ref @@ -1 +1 @@ -PNG image data 314 x 343 8-bit/color RGB non-interlaced +PNG image data, 314 x 343, 8-bit/color RGB, non-interlaced diff --git a/tests/file-tests/reference/po/rev0.0.po.ref b/tests/file-tests/reference/po/rev0.0.po.ref index 6a07036..2b12895 100644 --- a/tests/file-tests/reference/po/rev0.0.po.ref +++ b/tests/file-tests/reference/po/rev0.0.po.ref @@ -1 +1 @@ -GNU gettext message catalogue ASCII text +GNU gettext message catalogue, ASCII text diff --git a/tests/file-tests/reference/po/rev0.1.po.ref b/tests/file-tests/reference/po/rev0.1.po.ref index 6a07036..2b12895 100644 --- a/tests/file-tests/reference/po/rev0.1.po.ref +++ b/tests/file-tests/reference/po/rev0.1.po.ref @@ -1 +1 @@ -GNU gettext message catalogue ASCII text +GNU gettext message catalogue, ASCII text diff --git a/tests/file-tests/reference/po/rev1.1.po.ref b/tests/file-tests/reference/po/rev1.1.po.ref index 6a07036..2b12895 100644 --- a/tests/file-tests/reference/po/rev1.1.po.ref +++ b/tests/file-tests/reference/po/rev1.1.po.ref @@ -1 +1 @@ -GNU gettext message catalogue ASCII text +GNU gettext message catalogue, ASCII text diff --git a/tests/file-tests/reference/po/test.po.ref b/tests/file-tests/reference/po/test.po.ref index ae50a81..1b646cf 100644 --- a/tests/file-tests/reference/po/test.po.ref +++ b/tests/file-tests/reference/po/test.po.ref @@ -1 +1 @@ -GNU gettext message catalogue UTF-8 Unicode text +GNU gettext message catalogue, Unicode text, UTF-8 text diff --git a/tests/file-tests/reference/pot/presentation.pot.ref b/tests/file-tests/reference/pot/presentation.pot.ref index 7d412f8..087d7d4 100644 --- a/tests/file-tests/reference/pot/presentation.pot.ref +++ b/tests/file-tests/reference/pot/presentation.pot.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 4 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 12:42:52 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 4, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 12:42:52 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/pot/presentation_with_autostart_macro.pot.ref b/tests/file-tests/reference/pot/presentation_with_autostart_macro.pot.ref index 9a7f637..a137d8d 100644 --- a/tests/file-tests/reference/pot/presentation_with_autostart_macro.pot.ref +++ b/tests/file-tests/reference/pot/presentation_with_autostart_macro.pot.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 3 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 10:44:42 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 3, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 10:44:42 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/ppa/presentation_non_auto_macros.ppa.ref b/tests/file-tests/reference/ppa/presentation_non_auto_macros.ppa.ref index f3e97ff..7adf718 100644 --- a/tests/file-tests/reference/ppa/presentation_non_auto_macros.ppa.ref +++ b/tests/file-tests/reference/ppa/presentation_non_auto_macros.ppa.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 5 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 13:41:54 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 5, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 13:41:54 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/ppc/coredump-ppc.ref b/tests/file-tests/reference/ppc/coredump-ppc.ref new file mode 100644 index 0000000..f09efa7 --- /dev/null +++ b/tests/file-tests/reference/ppc/coredump-ppc.ref @@ -0,0 +1 @@ +ELF 32-bit MSB core file, PowerPC or cisco 4500, version 1 (SYSV), SVR4-style, from './a.out', real uid: 0, effective uid: 0, real gid: 0, effective gid: 0, platform: 'power6' diff --git a/tests/file-tests/reference/ppd/Generic-PDF_Printer-PDF.ppd.ref b/tests/file-tests/reference/ppd/Generic-PDF_Printer-PDF.ppd.ref index 9bb0591..777e1b4 100644 --- a/tests/file-tests/reference/ppd/Generic-PDF_Printer-PDF.ppd.ref +++ b/tests/file-tests/reference/ppd/Generic-PDF_Printer-PDF.ppd.ref @@ -1 +1 @@ -PPD file version "4.3" +PPD file, version "4.3" diff --git a/tests/file-tests/reference/ppm/a.ppm.ref b/tests/file-tests/reference/ppm/a.ppm.ref index 8695b1d..db0305e 100644 --- a/tests/file-tests/reference/ppm/a.ppm.ref +++ b/tests/file-tests/reference/ppm/a.ppm.ref @@ -1 +1 @@ -Netpbm image data size = 200 x 200 greymap ASCII text +Netpbm image data, size = 200 x 200, greymap, ASCII text diff --git a/tests/file-tests/reference/pps/presentation.pps.ref b/tests/file-tests/reference/pps/presentation.pps.ref index 600a9ae..8735b90 100644 --- a/tests/file-tests/reference/pps/presentation.pps.ref +++ b/tests/file-tests/reference/pps/presentation.pps.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 4 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 12:43:22 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 4, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 12:43:22 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/pps/presentation_with_autostart_macro.pps.ref b/tests/file-tests/reference/pps/presentation_with_autostart_macro.pps.ref index cada107..f33c672 100644 --- a/tests/file-tests/reference/pps/presentation_with_autostart_macro.pps.ref +++ b/tests/file-tests/reference/pps/presentation_with_autostart_macro.pps.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 4 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 13:24:56 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 4, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 13:24:56 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/ppt/encrypted.ppt.ref b/tests/file-tests/reference/ppt/encrypted.ppt.ref index c44164a..2f361b8 100644 --- a/tests/file-tests/reference/ppt/encrypted.ppt.ref +++ b/tests/file-tests/reference/ppt/encrypted.ppt.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252 diff --git a/tests/file-tests/reference/ppt/presentation.ppt.ref b/tests/file-tests/reference/ppt/presentation.ppt.ref index 23feec8..b1d2aed 100644 --- a/tests/file-tests/reference/ppt/presentation.ppt.ref +++ b/tests/file-tests/reference/ppt/presentation.ppt.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 4 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 12:42:07 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 4, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 12:42:07 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/ppt/presentation_with_autostart_macro.ppt.ref b/tests/file-tests/reference/ppt/presentation_with_autostart_macro.ppt.ref index 8dd7906..5e08996 100644 --- a/tests/file-tests/reference/ppt/presentation_with_autostart_macro.ppt.ref +++ b/tests/file-tests/reference/ppt/presentation_with_autostart_macro.ppt.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Title: Prsentation Author: schulung Last Saved By: schulung Revision Number: 4 Name of Creating Application: Microsoft Office PowerPoint Create Time/Date: Fri Mar 11 10:34:10 2016 Last Saved Time/Date: Fri Mar 11 13:23:09 2016 Number of Words: 26 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Title: Prsentation, Author: schulung, Last Saved By: schulung, Revision Number: 4, Name of Creating Application: Microsoft Office PowerPoint, Create Time/Date: Fri Mar 11 10:34:10 2016, Last Saved Time/Date: Fri Mar 11 13:23:09 2016, Number of Words: 26 diff --git a/tests/file-tests/reference/ps/filtered-test.ps.ref b/tests/file-tests/reference/ps/filtered-test.ps.ref index b63893f..d37e56a 100644 --- a/tests/file-tests/reference/ps/filtered-test.ps.ref +++ b/tests/file-tests/reference/ps/filtered-test.ps.ref @@ -1 +1 @@ -PostScript document text conforming DSC level 3.0 Level 2 +PostScript document text conforming DSC level 3.0, Level 2 diff --git a/tests/file-tests/reference/py/Switchboard.py.ref b/tests/file-tests/reference/py/Switchboard.py.ref index 389d695..f8cab99 100644 --- a/tests/file-tests/reference/py/Switchboard.py.ref +++ b/tests/file-tests/reference/py/Switchboard.py.ref @@ -1 +1 @@ -Python script ASCII text executable +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/gtk_label_autowrap.py.ref b/tests/file-tests/reference/py/gtk_label_autowrap.py.ref index 389d695..f8cab99 100644 --- a/tests/file-tests/reference/py/gtk_label_autowrap.py.ref +++ b/tests/file-tests/reference/py/gtk_label_autowrap.py.ref @@ -1 +1 @@ -Python script ASCII text executable +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/music.py.ref b/tests/file-tests/reference/py/music.py.ref index b9b4294..d8ee970 100644 --- a/tests/file-tests/reference/py/music.py.ref +++ b/tests/file-tests/reference/py/music.py.ref @@ -1 +1 @@ -Python script ASCII text executable with CRLF line terminators +Python script, ASCII text executable, with CRLF line terminators diff --git a/tests/file-tests/reference/py/p1.py.ref b/tests/file-tests/reference/py/p1.py.ref new file mode 100644 index 0000000..f8cab99 --- /dev/null +++ b/tests/file-tests/reference/py/p1.py.ref @@ -0,0 +1 @@ +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/p2.py.ref b/tests/file-tests/reference/py/p2.py.ref new file mode 100644 index 0000000..f8cab99 --- /dev/null +++ b/tests/file-tests/reference/py/p2.py.ref @@ -0,0 +1 @@ +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/p3.py.ref b/tests/file-tests/reference/py/p3.py.ref new file mode 100644 index 0000000..f8cab99 --- /dev/null +++ b/tests/file-tests/reference/py/p3.py.ref @@ -0,0 +1 @@ +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/p4.py.ref b/tests/file-tests/reference/py/p4.py.ref new file mode 100644 index 0000000..f8cab99 --- /dev/null +++ b/tests/file-tests/reference/py/p4.py.ref @@ -0,0 +1 @@ +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/p5.py.ref b/tests/file-tests/reference/py/p5.py.ref new file mode 100644 index 0000000..f8cab99 --- /dev/null +++ b/tests/file-tests/reference/py/p5.py.ref @@ -0,0 +1 @@ +Python script, ASCII text executable diff --git a/tests/file-tests/reference/py/p6.py.ref b/tests/file-tests/reference/py/p6.py.ref new file mode 100644 index 0000000..f8cab99 --- /dev/null +++ b/tests/file-tests/reference/py/p6.py.ref @@ -0,0 +1 @@ +Python script, ASCII text executable diff --git a/tests/file-tests/reference/rar/encrypted-hidden-filenames.rar.ref b/tests/file-tests/reference/rar/encrypted-hidden-filenames.rar.ref index 38c0424..79c77be 100644 --- a/tests/file-tests/reference/rar/encrypted-hidden-filenames.rar.ref +++ b/tests/file-tests/reference/rar/encrypted-hidden-filenames.rar.ref @@ -1 +1 @@ -RAR archive data v5 +RAR archive data, v5 diff --git a/tests/file-tests/reference/rar/encrypted.rar.ref b/tests/file-tests/reference/rar/encrypted.rar.ref index 38c0424..79c77be 100644 --- a/tests/file-tests/reference/rar/encrypted.rar.ref +++ b/tests/file-tests/reference/rar/encrypted.rar.ref @@ -1 +1 @@ -RAR archive data v5 +RAR archive data, v5 diff --git a/tests/file-tests/reference/rar/normal.rar.ref b/tests/file-tests/reference/rar/normal.rar.ref index 38c0424..79c77be 100644 --- a/tests/file-tests/reference/rar/normal.rar.ref +++ b/tests/file-tests/reference/rar/normal.rar.ref @@ -1 +1 @@ -RAR archive data v5 +RAR archive data, v5 diff --git a/tests/file-tests/reference/rar/rar-v4-archive.rar.ref b/tests/file-tests/reference/rar/rar-v4-archive.rar.ref index 7479ec2..22db36d 100644 --- a/tests/file-tests/reference/rar/rar-v4-archive.rar.ref +++ b/tests/file-tests/reference/rar/rar-v4-archive.rar.ref @@ -1 +1 @@ -RAR archive data v4 os: Win32 +RAR archive data, v4, os: Win32 diff --git a/tests/file-tests/reference/rb/docbook.rb.ref b/tests/file-tests/reference/rb/docbook.rb.ref index 1211da3..f1b7c34 100644 --- a/tests/file-tests/reference/rb/docbook.rb.ref +++ b/tests/file-tests/reference/rb/docbook.rb.ref @@ -1 +1 @@ -Ruby script ASCII text +Ruby script, ASCII text diff --git a/tests/file-tests/reference/rtf/word_document.rtf.ref b/tests/file-tests/reference/rtf/word_document.rtf.ref index 9d88045..3e629b8 100644 --- a/tests/file-tests/reference/rtf/word_document.rtf.ref +++ b/tests/file-tests/reference/rtf/word_document.rtf.ref @@ -1 +1 @@ -Rich Text Format data version 1 unknown character set +Rich Text Format data, version 1, ANSI, code page 1252, default middle east language ID 1025 diff --git a/tests/file-tests/reference/s/boring-asm.s.ref b/tests/file-tests/reference/s/boring-asm.s.ref index 353375f..1a52a4c 100644 --- a/tests/file-tests/reference/s/boring-asm.s.ref +++ b/tests/file-tests/reference/s/boring-asm.s.ref @@ -1 +1 @@ -assembler source ASCII text +assembler source, ASCII text diff --git a/tests/file-tests/reference/scr/SlideShow.scr.ref b/tests/file-tests/reference/scr/SlideShow.scr.ref index f7d8f93..75d49a8 100644 --- a/tests/file-tests/reference/scr/SlideShow.scr.ref +++ b/tests/file-tests/reference/scr/SlideShow.scr.ref @@ -1 +1 @@ -PE32 executable (GUI) Intel 80386 for MS Windows +PE32 executable (GUI) Intel 80386, for MS Windows diff --git a/tests/file-tests/reference/sct/editor_addin.sct.ref b/tests/file-tests/reference/sct/editor_addin.sct.ref index 62d87d7..0258011 100644 --- a/tests/file-tests/reference/sct/editor_addin.sct.ref +++ b/tests/file-tests/reference/sct/editor_addin.sct.ref @@ -1 +1 @@ -HTML document ASCII text +HTML document, ASCII text diff --git a/tests/file-tests/reference/shb/win_document_shortcut_full.shb.ref b/tests/file-tests/reference/shb/win_document_shortcut_full.shb.ref index 80c2148..beb3f9f 100644 --- a/tests/file-tests/reference/shb/win_document_shortcut_full.shb.ref +++ b/tests/file-tests/reference/shb/win_document_shortcut_full.shb.ref @@ -1 +1 @@ -Composite Document File V2 Document Cannot read section info +Composite Document File V2 Document, Cannot read section info diff --git a/tests/file-tests/reference/shs/win_scrap_file_full.shs.ref b/tests/file-tests/reference/shs/win_scrap_file_full.shs.ref index 80c2148..beb3f9f 100644 --- a/tests/file-tests/reference/shs/win_scrap_file_full.shs.ref +++ b/tests/file-tests/reference/shs/win_scrap_file_full.shs.ref @@ -1 +1 @@ -Composite Document File V2 Document Cannot read section info +Composite Document File V2 Document, Cannot read section info diff --git a/tests/file-tests/reference/slk/excel4_sample_macro.slk.ref b/tests/file-tests/reference/slk/excel4_sample_macro.slk.ref new file mode 100644 index 0000000..d3f5875 --- /dev/null +++ b/tests/file-tests/reference/slk/excel4_sample_macro.slk.ref @@ -0,0 +1 @@ +spreadsheet interchange document, created by Excel diff --git a/tests/file-tests/reference/slk/simple-slk-file.slk.ref b/tests/file-tests/reference/slk/simple-slk-file.slk.ref new file mode 100644 index 0000000..d3f5875 --- /dev/null +++ b/tests/file-tests/reference/slk/simple-slk-file.slk.ref @@ -0,0 +1 @@ +spreadsheet interchange document, created by Excel diff --git a/tests/file-tests/reference/so/libaio.so.ref b/tests/file-tests/reference/so/libaio.so.ref deleted file mode 100644 index 561b672..0000000 --- a/tests/file-tests/reference/so/libaio.so.ref +++ /dev/null @@ -1 +0,0 @@ -ELF 64-bit LSB pie executable x86-64 version 1 (SYSV) dynamically linked BuildID[sha1]=f46fe3be0225f73ae49ab6697a3a24088231fbf0 stripped diff --git a/tests/file-tests/reference/so/libtables.so.ref b/tests/file-tests/reference/so/libtables.so.ref index 2b8299b..b7e77bc 100644 --- a/tests/file-tests/reference/so/libtables.so.ref +++ b/tests/file-tests/reference/so/libtables.so.ref @@ -1 +1 @@ -ELF 64-bit LSB shared object x86-64 version 1 (SYSV) dynamically linked BuildID[sha1]=547300845a8d79bfbf3516a4d7764038b07cdf12 not stripped +ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=547300845a8d79bfbf3516a4d7764038b07cdf12, not stripped diff --git a/tests/file-tests/reference/tar.gz/a.tar.gz.ref b/tests/file-tests/reference/tar.gz/a.tar.gz.ref deleted file mode 100644 index cf0209d..0000000 --- a/tests/file-tests/reference/tar.gz/a.tar.gz.ref +++ /dev/null @@ -1 +0,0 @@ -gzip compressed data last modified: Tue May 18 13:48:33 2010 max compression from Unix original size 2982691562 diff --git a/tests/file-tests/reference/tdb/test.tdb.ref b/tests/file-tests/reference/tdb/test.tdb.ref index db0b52a..31dbdf0 100644 --- a/tests/file-tests/reference/tdb/test.tdb.ref +++ b/tests/file-tests/reference/tdb/test.tdb.ref @@ -1 +1 @@ -TDB database version 6 little-endian hash size 131 bytes +TDB database version 6, little-endian hash size 131 bytes diff --git a/tests/file-tests/reference/tex/pl-refcard.tex.ref b/tests/file-tests/reference/tex/pl-refcard.tex.ref index 1415685..4356ef0 100644 --- a/tests/file-tests/reference/tex/pl-refcard.tex.ref +++ b/tests/file-tests/reference/tex/pl-refcard.tex.ref @@ -1 +1 @@ -TeX document ASCII text +TeX document, ASCII text diff --git a/tests/file-tests/reference/tex/sk-survival.tex.ref b/tests/file-tests/reference/tex/sk-survival.tex.ref index a74b224..8645181 100644 --- a/tests/file-tests/reference/tex/sk-survival.tex.ref +++ b/tests/file-tests/reference/tex/sk-survival.tex.ref @@ -1 +1 @@ -LaTeX document ISO-8859 text +LaTeX document, ISO-8859 text diff --git a/tests/file-tests/reference/tex/test_latex.tex.ref b/tests/file-tests/reference/tex/test_latex.tex.ref index 81a49d9..09121c6 100644 --- a/tests/file-tests/reference/tex/test_latex.tex.ref +++ b/tests/file-tests/reference/tex/test_latex.tex.ref @@ -1 +1 @@ -LaTeX 2e document ASCII text +LaTeX 2e document, ASCII text diff --git a/tests/file-tests/reference/tgz/broken-file.tgz.ref b/tests/file-tests/reference/tgz/broken-file.tgz.ref deleted file mode 100644 index af68ec3..0000000 --- a/tests/file-tests/reference/tgz/broken-file.tgz.ref +++ /dev/null @@ -1 +0,0 @@ -gzip compressed data last modified: Thu Feb 14 03:01:37 2008 from Unix original size 2814003271 diff --git a/tests/file-tests/reference/tif/note.tif.ref b/tests/file-tests/reference/tif/note.tif.ref index e2132e5..99a1837 100644 --- a/tests/file-tests/reference/tif/note.tif.ref +++ b/tests/file-tests/reference/tif/note.tif.ref @@ -1 +1 @@ -TIFF image data little-endian direntries=13 height=24 bps=8 compression=LZW PhotometricIntepretation=BlackIsZero width=24 +TIFF image data, little-endian, direntries=13, height=24, bps=8, compression=LZW, PhotometricIntepretation=BlackIsZero, width=24 diff --git a/tests/file-tests/reference/timezone/localtime.ref b/tests/file-tests/reference/timezone/localtime.ref index eab36ff..1c3df74 100644 --- a/tests/file-tests/reference/timezone/localtime.ref +++ b/tests/file-tests/reference/timezone/localtime.ref @@ -1 +1 @@ -timezone data version 2 6 gmt time flags 6 std time flags no leap seconds 141 transition times 6 abbreviation chars +timezone data (fat), version 2, 6 gmt time flags, 6 std time flags, no leap seconds, 141 transition times, 6 local time types, 9 abbreviation chars diff --git a/tests/file-tests/reference/ttf/NanumGothic.ttf.ref b/tests/file-tests/reference/ttf/NanumGothic.ttf.ref index 3af15c6..c8dff04 100644 --- a/tests/file-tests/reference/ttf/NanumGothic.ttf.ref +++ b/tests/file-tests/reference/ttf/NanumGothic.ttf.ref @@ -1 +1 @@ -TrueType Font data 15 tables 1st "OS/2" name offset 0x424104 +TrueType Font data, 15 tables, 1st "OS/2", name offset 0x424104 diff --git a/tests/file-tests/reference/txt/dsn_15.txt.ref b/tests/file-tests/reference/txt/dsn_15.txt.ref index 172307a..7f7bc56 100644 --- a/tests/file-tests/reference/txt/dsn_15.txt.ref +++ b/tests/file-tests/reference/txt/dsn_15.txt.ref @@ -1 +1 @@ -RFC 822 mail ASCII text +RFC 822 mail, ASCII text diff --git a/tests/file-tests/reference/txt/msg-6505-1.txt.ref b/tests/file-tests/reference/txt/msg-6505-1.txt.ref index b1f5bce..7f76cd2 100644 --- a/tests/file-tests/reference/txt/msg-6505-1.txt.ref +++ b/tests/file-tests/reference/txt/msg-6505-1.txt.ref @@ -1 +1 @@ -ISO-8859 text with CRLF line terminators +ISO-8859 text, with CRLF line terminators diff --git a/tests/file-tests/reference/vb/HelloWorld.vb.ref b/tests/file-tests/reference/vb/HelloWorld.vb.ref index 2135468..1bfd26b 100644 --- a/tests/file-tests/reference/vb/HelloWorld.vb.ref +++ b/tests/file-tests/reference/vb/HelloWorld.vb.ref @@ -1 +1 @@ -UTF-8 Unicode (with BOM) text +Unicode text, UTF-8 (with BOM) text diff --git a/tests/file-tests/reference/wav/b0456.wav.ref b/tests/file-tests/reference/wav/b0456.wav.ref index 74443c8..ba738e7 100644 --- a/tests/file-tests/reference/wav/b0456.wav.ref +++ b/tests/file-tests/reference/wav/b0456.wav.ref @@ -1 +1 @@ -RIFF (little-endian) data WAVE audio Microsoft PCM 16 bit mono 16000 Hz +RIFF (little-endian) data, WAVE audio, Microsoft PCM, 16 bit, mono 16000 Hz diff --git a/tests/file-tests/reference/wav/send.wav.ref b/tests/file-tests/reference/wav/send.wav.ref index ec9ccbe..be3c5d1 100644 --- a/tests/file-tests/reference/wav/send.wav.ref +++ b/tests/file-tests/reference/wav/send.wav.ref @@ -1 +1 @@ -RIFF (little-endian) data WAVE audio Microsoft PCM 16 bit stereo 22050 Hz +RIFF (little-endian) data, WAVE audio, Microsoft PCM, 16 bit, stereo 22050 Hz diff --git a/tests/file-tests/reference/webm/bunny.webm.ref b/tests/file-tests/reference/webm/bunny.webm.ref deleted file mode 100644 index d6ad112..0000000 --- a/tests/file-tests/reference/webm/bunny.webm.ref +++ /dev/null @@ -1 +0,0 @@ -WebM diff --git a/tests/file-tests/reference/wps/word_document.wps.ref b/tests/file-tests/reference/wps/word_document.wps.ref index 80c2148..beb3f9f 100644 --- a/tests/file-tests/reference/wps/word_document.wps.ref +++ b/tests/file-tests/reference/wps/word_document.wps.ref @@ -1 +1 @@ -Composite Document File V2 Document Cannot read section info +Composite Document File V2 Document, Cannot read section info diff --git a/tests/file-tests/reference/wsc/HelloWorld.wsc.ref b/tests/file-tests/reference/wsc/HelloWorld.wsc.ref index d01b29a..af7ebfb 100644 --- a/tests/file-tests/reference/wsc/HelloWorld.wsc.ref +++ b/tests/file-tests/reference/wsc/HelloWorld.wsc.ref @@ -1 +1 @@ -HTML document ASCII text with very long lines +HTML document, ASCII text, with very long lines (1892) diff --git a/tests/file-tests/reference/wsf/HelloWorld.wsf.ref b/tests/file-tests/reference/wsf/HelloWorld.wsf.ref index 23715bc..9f6c7a4 100644 --- a/tests/file-tests/reference/wsf/HelloWorld.wsf.ref +++ b/tests/file-tests/reference/wsf/HelloWorld.wsf.ref @@ -1 +1 @@ -XML 1.0 document UTF-8 Unicode (with BOM) text +XML 1.0 document, Unicode text, UTF-8 (with BOM) text diff --git a/tests/file-tests/reference/xls/calculation-new-format.xls.ref b/tests/file-tests/reference/xls/calculation-new-format.xls.ref index 3cb2f92..d30b251 100644 --- a/tests/file-tests/reference/xls/calculation-new-format.xls.ref +++ b/tests/file-tests/reference/xls/calculation-new-format.xls.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Last Saved By: schulung Name of Creating Application: Microsoft Excel Create Time/Date: Fri Mar 11 09:35:45 2016 Last Saved Time/Date: Fri Mar 11 12:53:11 2016 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Last Saved By: schulung, Name of Creating Application: Microsoft Excel, Create Time/Date: Fri Mar 11 09:35:45 2016, Last Saved Time/Date: Fri Mar 11 12:53:11 2016, Security: 0 diff --git a/tests/file-tests/reference/xls/calculation-old-format.xls.ref b/tests/file-tests/reference/xls/calculation-old-format.xls.ref index ea774d8..4718721 100644 --- a/tests/file-tests/reference/xls/calculation-old-format.xls.ref +++ b/tests/file-tests/reference/xls/calculation-old-format.xls.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Last Saved By: schulung Name of Creating Application: Microsoft Excel Create Time/Date: Fri Mar 11 09:35:45 2016 Last Saved Time/Date: Fri Mar 11 12:57:51 2016 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Last Saved By: schulung, Name of Creating Application: Microsoft Excel, Create Time/Date: Fri Mar 11 09:35:45 2016, Last Saved Time/Date: Fri Mar 11 12:57:51 2016, Security: 0 diff --git a/tests/file-tests/reference/xls/calculation_with_autostart_macro.xls.ref b/tests/file-tests/reference/xls/calculation_with_autostart_macro.xls.ref index 00a715e..1c0ec0a 100644 --- a/tests/file-tests/reference/xls/calculation_with_autostart_macro.xls.ref +++ b/tests/file-tests/reference/xls/calculation_with_autostart_macro.xls.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Last Saved By: schulung Name of Creating Application: Microsoft Excel Create Time/Date: Fri Mar 11 09:35:45 2016 Last Saved Time/Date: Fri Mar 11 10:04:47 2016 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Last Saved By: schulung, Name of Creating Application: Microsoft Excel, Create Time/Date: Fri Mar 11 09:35:45 2016, Last Saved Time/Date: Fri Mar 11 10:04:47 2016, Security: 0 diff --git a/tests/file-tests/reference/xls/encrypted.xls.ref b/tests/file-tests/reference/xls/encrypted.xls.ref deleted file mode 100644 index c7986a7..0000000 --- a/tests/file-tests/reference/xls/encrypted.xls.ref +++ /dev/null @@ -1 +0,0 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: user Last Saved By: user Name of Creating Application: Microsoft Excel Create Time/Date: Wed Oct 17 12:30:05 2018 Last Saved Time/Date: Wed Oct 17 12:31:27 2018 Security: 1 diff --git a/tests/file-tests/reference/xls/excel-file.xls.ref b/tests/file-tests/reference/xls/excel-file.xls.ref deleted file mode 100644 index 28ebdc2..0000000 --- a/tests/file-tests/reference/xls/excel-file.xls.ref +++ /dev/null @@ -1 +0,0 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 1.0 Code page: -535 Author: Gunnar Wrobel Last Saved By: Gunnar Wrobel Revision Number: 1 Total Editing Time: 00:35 Create Time/Date: Tue Jun 5 07:57:36 2012 Last Saved Time/Date: Tue Jun 5 07:58:09 2012 diff --git a/tests/file-tests/reference/xlt/calculation.xlt.ref b/tests/file-tests/reference/xlt/calculation.xlt.ref index 2ebfff5..4d2ed37 100644 --- a/tests/file-tests/reference/xlt/calculation.xlt.ref +++ b/tests/file-tests/reference/xlt/calculation.xlt.ref @@ -1 +1 @@ -Composite Document File V2 Document Little Endian Os: Windows Version 6.1 Code page: 1252 Author: schulung Last Saved By: schulung Name of Creating Application: Microsoft Excel Create Time/Date: Fri Mar 11 09:35:45 2016 Last Saved Time/Date: Fri Mar 11 12:54:41 2016 Security: 0 +Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, Code page: 1252, Author: schulung, Last Saved By: schulung, Name of Creating Application: Microsoft Excel, Create Time/Date: Fri Mar 11 09:35:45 2016, Last Saved Time/Date: Fri Mar 11 12:54:41 2016, Security: 0 diff --git a/tests/file-tests/reference/xml/calculation.xml.ref b/tests/file-tests/reference/xml/calculation.xml.ref index 6b311d5..1d340df 100644 --- a/tests/file-tests/reference/xml/calculation.xml.ref +++ b/tests/file-tests/reference/xml/calculation.xml.ref @@ -1 +1 @@ -XML 1.0 document ASCII text with CRLF line terminators +XML 1.0 document, ASCII text, with CRLF line terminators diff --git a/tests/file-tests/reference/xml/output.xml.ref b/tests/file-tests/reference/xml/output.xml.ref index f8c5796..d79147f 100644 --- a/tests/file-tests/reference/xml/output.xml.ref +++ b/tests/file-tests/reference/xml/output.xml.ref @@ -1 +1 @@ -XML 1.0 document Little-endian UTF-16 Unicode text +XML 1.0 document, Unicode text, UTF-16, little-endian text diff --git a/tests/file-tests/reference/xml/result.xml.ref b/tests/file-tests/reference/xml/result.xml.ref index f470bed..d6e9450 100644 --- a/tests/file-tests/reference/xml/result.xml.ref +++ b/tests/file-tests/reference/xml/result.xml.ref @@ -1 +1 @@ -XML 1.0 document ASCII text +XML 1.0 document, ASCII text diff --git a/tests/file-tests/reference/xml/xmlutf16.xml.ref b/tests/file-tests/reference/xml/xmlutf16.xml.ref index f8c5796..d79147f 100644 --- a/tests/file-tests/reference/xml/xmlutf16.xml.ref +++ b/tests/file-tests/reference/xml/xmlutf16.xml.ref @@ -1 +1 @@ -XML 1.0 document Little-endian UTF-16 Unicode text +XML 1.0 document, Unicode text, UTF-16, little-endian text diff --git a/tests/file-tests/reference/xps/presentation.xps.ref b/tests/file-tests/reference/xps/presentation.xps.ref deleted file mode 100644 index f41a548..0000000 --- a/tests/file-tests/reference/xps/presentation.xps.ref +++ /dev/null @@ -1 +0,0 @@ -Microsoft OOXML diff --git a/tests/file-tests/reference/xsl/table.xsl.ref b/tests/file-tests/reference/xsl/table.xsl.ref index aa8da61..4ffc176 100644 --- a/tests/file-tests/reference/xsl/table.xsl.ref +++ b/tests/file-tests/reference/xsl/table.xsl.ref @@ -1 +1 @@ -XML 1.0 document ASCII text with very long lines +XML 1.0 document, ASCII text, with very long lines (429) diff --git a/tests/file-tests/reference/z5/Aisle.z5.ref b/tests/file-tests/reference/z5/Aisle.z5.ref index 34b8702..d19e13f 100644 --- a/tests/file-tests/reference/z5/Aisle.z5.ref +++ b/tests/file-tests/reference/z5/Aisle.z5.ref @@ -1 +1 @@ -Infocom (Z-machine 5 Release 1 Serial 990528) +Infocom (Z-machine 5, Release 1, Serial 990528) diff --git a/tests/file-tests/reference/z5/guess.z5.ref b/tests/file-tests/reference/z5/guess.z5.ref index fa72165..a617efd 100644 --- a/tests/file-tests/reference/z5/guess.z5.ref +++ b/tests/file-tests/reference/z5/guess.z5.ref @@ -1 +1 @@ -Infocom (Z-machine 5 Release 4 Serial 001210) +Infocom (Z-machine 5, Release 4, Serial 001210) diff --git a/tests/file-tests/reference/z5/stiffmst.z5.ref b/tests/file-tests/reference/z5/stiffmst.z5.ref index 7df9707..6c80ada 100644 --- a/tests/file-tests/reference/z5/stiffmst.z5.ref +++ b/tests/file-tests/reference/z5/stiffmst.z5.ref @@ -1 +1 @@ -Infocom (Z-machine 5 Release 69 Serial 690609) +Infocom (Z-machine 5, Release 69, Serial 690609) diff --git a/tests/file-tests/reference/z7/custard.z7.ref b/tests/file-tests/reference/z7/custard.z7.ref index cde0b6d..a1fa464 100644 --- a/tests/file-tests/reference/z7/custard.z7.ref +++ b/tests/file-tests/reference/z7/custard.z7.ref @@ -1 +1 @@ -Infocom (Z-machine 7 Release 1 Serial 000314) +Infocom (Z-machine 7, Release 1, Serial 000314) diff --git a/tests/file-tests/reference/z8/ats.z8.ref b/tests/file-tests/reference/z8/ats.z8.ref index 066abe8..575e3bf 100644 --- a/tests/file-tests/reference/z8/ats.z8.ref +++ b/tests/file-tests/reference/z8/ats.z8.ref @@ -1 +1 @@ -Infocom (Z-machine 8 Release 1 Serial 000001) +Infocom (Z-machine 8, Release 1, Serial 000001) diff --git a/tests/file-tests/reference/zip/VisualC.zip.ref b/tests/file-tests/reference/zip/VisualC.zip.ref index 8279888..a81e8c1 100644 --- a/tests/file-tests/reference/zip/VisualC.zip.ref +++ b/tests/file-tests/reference/zip/VisualC.zip.ref @@ -1 +1 @@ -Zip archive data at least v1.0 to extract +Zip archive data, at least v1.0 to extract, compression method=store diff --git a/tests/file-tests/reference/zip/stde.zip.ref b/tests/file-tests/reference/zip/stde.zip.ref index 1ba729a..3176dc4 100644 --- a/tests/file-tests/reference/zip/stde.zip.ref +++ b/tests/file-tests/reference/zip/stde.zip.ref @@ -1 +1 @@ -Zip archive data at least v2.0 to extract +Zip archive data, at least v2.0 to extract, compression method=deflate diff --git a/tests/file-tests/runtest.sh b/tests/file-tests/runtest.sh index 5f2f00c..508945e 100755 --- a/tests/file-tests/runtest.sh +++ b/tests/file-tests/runtest.sh @@ -1,765 +1,807 @@ #!/bin/bash +. /usr/share/beakerlib/beakerlib.sh + +compare() { + IN="db/$1" + OUT="$TMPDIR/out" + rlRun "file '$IN' > '$OUT'" "0" "Run file on $1" + sed -i "s|^$IN: ||" "$OUT" + REF="reference/$1.ref" + if ! rlAssertNotDiffer "$REF" "$OUT"; then + rlRun -l "diff -u '$REF' '$OUT'" 1 + fi +} -mkdir tmp -cd db -for d in * ; do - mkdir ../tmp/$d - for f in $d/* ; do - if [[ ${f: -11} != ".source.txt" ]]; then - file $1 $f | sed -n -e "s:$f\: ::p" | sed 's/,//g' > ../tmp/$f.my - fi - done -done +PACKAGE="file" -cd .. +rlJournalStart -. /usr/bin/rhts-environment.sh -. /usr/share/beakerlib/beakerlib.sh + rlPhaseStartSetup + rlAssertRpm "$PACKAGE" + TMPDIR="$(mktemp -d)" + rlPhaseEnd -PACKAGE="file" + rlPhaseStartTest '3ds' + compare '3ds/key.3DS' + rlPhaseEnd -rlJournalStart + rlPhaseStartTest '7z' + compare '7z/spectrum.7z' + rlPhaseEnd + + rlPhaseStartTest 'accdb' + compare 'accdb/database.accdb' + rlPhaseEnd + + rlPhaseStartTest 'ade' + compare 'ade/ms_access_project_encoded.ade' + rlPhaseEnd - rlPhaseStartSetup - rlAssertRpm $PACKAGE + rlPhaseStartTest 'adp' + compare 'adp/ms_access_project.adp' rlPhaseEnd - rlPhaseStartTest "accdb" - rlAssertNotDiffer "reference/accdb/database.accdb.ref" "tmp/accdb/database.accdb.my" + rlPhaseStartTest 'ani' + compare 'ani/animated_cursor.ani' rlPhaseEnd - rlPhaseStartTest "ade" - rlAssertNotDiffer "reference/ade/ms_access_project_encoded.ade.ref" "tmp/ade/ms_access_project_encoded.ade.my" + rlPhaseStartTest 'AppleDouble' + compare 'AppleDouble/AppleDouble' rlPhaseEnd - rlPhaseStartTest "adp" - rlAssertNotDiffer "reference/adp/ms_access_project.adp.ref" "tmp/adp/ms_access_project.adp.my" + rlPhaseStartTest 'asa' + compare 'asa/global.asa' rlPhaseEnd - rlPhaseStartTest "ani" - rlAssertNotDiffer "reference/ani/animated_cursor.ani.ref" "tmp/ani/animated_cursor.ani.my" + rlPhaseStartTest 'asp' + compare 'asp/policies_part.asp' rlPhaseEnd - rlPhaseStartTest "AppleDouble" - rlAssertNotDiffer "reference/AppleDouble/AppleDouble.ref" "tmp/AppleDouble/AppleDouble.my" + rlPhaseStartTest 'bas' + compare 'bas/PILES_START.bas' rlPhaseEnd - rlPhaseStartTest "asa" - rlAssertNotDiffer "reference/asa/global.asa.ref" "tmp/asa/global.asa.my" + rlPhaseStartTest 'bat' + compare 'bat/build.bat' rlPhaseEnd - rlPhaseStartTest "asp" - rlAssertNotDiffer "reference/asp/policies_part.asp.ref" "tmp/asp/policies_part.asp.my" + rlPhaseStartTest 'bin' + compare 'bin/vax' rlPhaseEnd - rlPhaseStartTest "bas" - rlAssertNotDiffer "reference/bas/PILES_START.bas.ref" "tmp/bas/PILES_START.bas.my" + rlPhaseStartTest 'bmp' + compare 'bmp/4x2x24-win3.bmp' + compare 'bmp/4x2x32-win95.bmp' + compare 'bmp/4x2x32-win98.bmp' + compare 'bmp/InstallerHeader.bmp' rlPhaseEnd - rlPhaseStartTest "bat" - rlAssertNotDiffer "reference/bat/build.bat.ref" "tmp/bat/build.bat.my" + rlPhaseStartTest 'bz2' + compare 'bz2/test.txt.bz2' rlPhaseEnd - rlPhaseStartTest "bin" - rlAssertNotDiffer "reference/bin/vax.ref" "tmp/bin/vax.my" + rlPhaseStartTest 'cab' rlPhaseEnd - rlPhaseStartTest "bmp" - rlAssertNotDiffer "reference/bmp/InstallerHeader.bmp.ref" "tmp/bmp/InstallerHeader.bmp.my" + rlPhaseStartTest 'chm' + compare 'chm/index_start.chm' rlPhaseEnd - rlPhaseStartTest "bz2" - rlAssertNotDiffer "reference/bz2/test.txt.bz2.ref" "tmp/bz2/test.txt.bz2.my" + rlPhaseStartTest 'cmd' + compare 'cmd/wp_batch_example.cmd' rlPhaseEnd - rlPhaseStartTest "cab" + rlPhaseStartTest 'cnt' + compare 'cnt/help-contents.cnt' rlPhaseEnd - rlPhaseStartTest "cmd" - rlAssertNotDiffer "reference/cmd/wp_batch_example.cmd.ref" "tmp/cmd/wp_batch_example.cmd.my" + rlPhaseStartTest 'com' + compare 'com/kssf.com' rlPhaseEnd - rlPhaseStartTest "cnt" - rlAssertNotDiffer "reference/cnt/help-contents.cnt.ref" "tmp/cnt/help-contents.cnt.my" + rlPhaseStartTest 'cpl' + compare 'cpl/ac3filter_first4k.cpl' rlPhaseEnd - rlPhaseStartTest "com" - rlAssertNotDiffer "reference/com/kssf.com.ref" "tmp/com/kssf.com.my" + rlPhaseStartTest 'cpp' + compare 'cpp/test.cpp' rlPhaseEnd - rlPhaseStartTest "cpl" - rlAssertNotDiffer "reference/cpl/ac3filter_first4k.cpl.ref" "tmp/cpl/ac3filter_first4k.cpl.my" + rlPhaseStartTest 'crt' + compare 'crt/server.crt' rlPhaseEnd - rlPhaseStartTest "cpp" - rlAssertNotDiffer "reference/cpp/test.cpp.ref" "tmp/cpp/test.cpp.my" + rlPhaseStartTest 'cur' + compare 'cur/cursor.cur' rlPhaseEnd - rlPhaseStartTest "crt" - rlAssertNotDiffer "reference/crt/server.crt.ref" "tmp/crt/server.crt.my" + rlPhaseStartTest 'dat' + compare 'dat/winmail.dat' rlPhaseEnd - rlPhaseStartTest "cur" - rlAssertNotDiffer "reference/cur/cursor.cur.ref" "tmp/cur/cursor.cur.my" + rlPhaseStartTest 'db' + compare 'db/sqlite3.db' + compare 'db/thumbs.db' rlPhaseEnd - rlPhaseStartTest "dat" - rlAssertNotDiffer "reference/dat/winmail.dat.ref" "tmp/dat/winmail.dat.my" + rlPhaseStartTest 'dbf' + compare 'dbf/biblio.dbf' rlPhaseEnd - rlPhaseStartTest "db" - rlAssertNotDiffer "reference/db/sqlite3.db.ref" "tmp/db/sqlite3.db.my" - rlAssertNotDiffer "reference/db/thumbs.db.ref" "tmp/db/thumbs.db.my" + rlPhaseStartTest 'deb' + compare 'deb/p.deb' rlPhaseEnd - rlPhaseStartTest "dbf" - rlAssertNotDiffer "reference/dbf/biblio.dbf.ref" "tmp/dbf/biblio.dbf.my" + rlPhaseStartTest 'diso' + compare 'diso/foo.diso' rlPhaseEnd - rlPhaseStartTest "deb" - rlAssertNotDiffer "reference/deb/p.deb.ref" "tmp/deb/p.deb.my" + rlPhaseStartTest 'dll' + compare 'dll/SDL2.dll' rlPhaseEnd - rlPhaseStartTest "diso" - rlAssertNotDiffer "reference/diso/foo.diso.ref" "tmp/diso/foo.diso.my" + rlPhaseStartTest 'dmp' + compare 'dmp/mdmp.dmp' rlPhaseEnd - rlPhaseStartTest "dll" - rlAssertNotDiffer "reference/dll/SDL2.dll.ref" "tmp/dll/SDL2.dll.my" + rlPhaseStartTest 'doc' + compare 'doc/word_document.doc' + compare 'doc/word_document_with_autostart_macro.doc' rlPhaseEnd - rlPhaseStartTest "dmp" - rlAssertNotDiffer "reference/dmp/mdmp.dmp.ref" "tmp/dmp/mdmp.dmp.my" + rlPhaseStartTest 'docm' + compare 'docm/encrypted.docm' + compare 'docm/word_document.docm' + compare 'docm/word_document_with_autostart_macro.docm' rlPhaseEnd - rlPhaseStartTest "doc" - rlAssertNotDiffer "reference/doc/word_document.doc.ref" "tmp/doc/word_document.doc.my" - rlAssertNotDiffer "reference/doc/word_document_with_autostart_macro.doc.ref" "tmp/doc/word_document_with_autostart_macro.doc.my" + rlPhaseStartTest 'docx' + compare 'docx/encrypted.docx' + compare 'docx/word_document.docx' rlPhaseEnd - rlPhaseStartTest "docm" - rlAssertNotDiffer "reference/docm/encrypted.docm.ref" "tmp/docm/encrypted.docm.my" - rlAssertNotDiffer "reference/docm/word_document.docm.ref" "tmp/docm/word_document.docm.my" - rlAssertNotDiffer "reference/docm/word_document_with_autostart_macro.docm.ref" "tmp/docm/word_document_with_autostart_macro.docm.my" + rlPhaseStartTest 'dot' + compare 'dot/word_document.dot' + compare 'dot/word_document_with_autostart_macro.dot' rlPhaseEnd - rlPhaseStartTest "docx" - rlAssertNotDiffer "reference/docx/encrypted.docx.ref" "tmp/docx/encrypted.docx.my" - rlAssertNotDiffer "reference/docx/word_document.docx.ref" "tmp/docx/word_document.docx.my" + rlPhaseStartTest 'dotm' + compare 'dotm/word_document.dotm' + compare 'dotm/word_document_with_autostart_macro.dotm' rlPhaseEnd - rlPhaseStartTest "dot" - rlAssertNotDiffer "reference/dot/word_document.dot.ref" "tmp/dot/word_document.dot.my" - rlAssertNotDiffer "reference/dot/word_document_with_autostart_macro.dot.ref" "tmp/dot/word_document_with_autostart_macro.dot.my" + rlPhaseStartTest 'dotx' + compare 'dotx/word_document.dotx' rlPhaseEnd - rlPhaseStartTest "dotm" - rlAssertNotDiffer "reference/dotm/word_document.dotm.ref" "tmp/dotm/word_document.dotm.my" - rlAssertNotDiffer "reference/dotm/word_document_with_autostart_macro.dotm.ref" "tmp/dotm/word_document_with_autostart_macro.dotm.my" + rlPhaseStartTest 'drpm' + compare 'drpm/foo1.drpm' + compare 'drpm/foo2.drpm' rlPhaseEnd - rlPhaseStartTest "dotx" - rlAssertNotDiffer "reference/dotx/word_document.dotx.ref" "tmp/dotx/word_document.dotx.my" + rlPhaseStartTest 'DS_Store' + compare 'DS_Store/DS_Store' rlPhaseEnd - rlPhaseStartTest "drpm" - rlAssertNotDiffer "reference/drpm/foo1.drpm.ref" "tmp/drpm/foo1.drpm.my" - rlAssertNotDiffer "reference/drpm/foo2.drpm.ref" "tmp/drpm/foo2.drpm.my" + rlPhaseStartTest 'dump' + compare 'dump/evolocal.odb' rlPhaseEnd - rlPhaseStartTest "DS_Store" - rlAssertNotDiffer "reference/DS_Store/DS_Store.ref" "tmp/DS_Store/DS_Store.my" + rlPhaseStartTest 'elf' + compare 'elf/a' + compare 'elf/filter' + compare 'elf/hello-aarch64-executable' + compare 'elf/library-now.so' + compare 'elf/new-keyctl.debug' + compare 'elf/old-keyctl.debug' + compare 'elf/pie-test' + compare 'elf/ppm' rlPhaseEnd - rlPhaseStartTest "dump" - rlAssertNotDiffer "reference/dump/evolocal.odb.ref" "tmp/dump/evolocal.odb.my" + rlPhaseStartTest 'exe' + compare 'exe/e5f5fdb10c8bb35d3219a87516147e15.exe' rlPhaseEnd - rlPhaseStartTest "elf" - rlAssertNotDiffer "reference/elf/a.ref" "tmp/elf/a.my" - rlAssertNotDiffer "reference/elf/filter.ref" "tmp/elf/filter.my" - rlAssertNotDiffer "reference/elf/hello-aarch64-executable.ref" "tmp/elf/hello-aarch64-executable.my" - rlAssertNotDiffer "reference/elf/library-now.so.ref" "tmp/elf/library-now.so.my" - rlAssertNotDiffer "reference/elf/new-keyctl.debug.ref" "tmp/elf/new-keyctl.debug.my" - rlAssertNotDiffer "reference/elf/old-keyctl.debug.ref" "tmp/elf/old-keyctl.debug.my" - rlAssertNotDiffer "reference/elf/pie-test.ref" "tmp/elf/pie-test.my" - rlAssertNotDiffer "reference/elf/ppm.ref" "tmp/elf/ppm.my" + rlPhaseStartTest 'filesystems' + compare 'filesystems/bootsector' + compare 'filesystems/ext4' + compare 'filesystems/filetest' + compare 'filesystems/lvm2' + compare 'filesystems/ntfs' + compare 'filesystems/swap-ia64' + compare 'filesystems/swap-ppc' rlPhaseEnd - rlPhaseStartTest "exe" - rlAssertNotDiffer "reference/exe/e5f5fdb10c8bb35d3219a87516147e15.exe.ref" "tmp/exe/e5f5fdb10c8bb35d3219a87516147e15.exe.my" + rlPhaseStartTest 'frm' + compare 'frm/help_relation.frm' rlPhaseEnd - rlPhaseStartTest "filesystems" - rlAssertNotDiffer "reference/filesystems/bootsector.ref" "tmp/filesystems/bootsector.my" - rlAssertNotDiffer "reference/filesystems/ext4.ref" "tmp/filesystems/ext4.my" - rlAssertNotDiffer "reference/filesystems/filetest.ref" "tmp/filesystems/filetest.my" - rlAssertNotDiffer "reference/filesystems/lvm2.ref" "tmp/filesystems/lvm2.my" - rlAssertNotDiffer "reference/filesystems/ntfs.ref" "tmp/filesystems/ntfs.my" - rlAssertNotDiffer "reference/filesystems/swap-ia64.ref" "tmp/filesystems/swap-ia64.my" - rlAssertNotDiffer "reference/filesystems/swap-ppc.ref" "tmp/filesystems/swap-ppc.my" + rlPhaseStartTest 'gif' + compare 'gif/1.gif' rlPhaseEnd - rlPhaseStartTest "frm" - rlAssertNotDiffer "reference/frm/help_relation.frm.ref" "tmp/frm/help_relation.frm.my" + rlPhaseStartTest 'gz' + compare 'gz/abc1.gz' + compare 'gz/abc2.gz' + compare 'gz/a.gz' rlPhaseEnd - rlPhaseStartTest "gif" - rlAssertNotDiffer "reference/gif/1.gif.ref" "tmp/gif/1.gif.my" + rlPhaseStartTest 'h' + compare 'h/a.h' + compare 'h/basic_string.h' + compare 'h/gclosure.h' + compare 'h/gfileattribute.h' + compare 'h/gfile.h' + compare 'h/gsocketaddressenumerator.h' + compare 'h/gunixmounts.h' + compare 'h/stl_map.h' + compare 'h/stl_queue.h' + compare 'h/stl_stack.h' rlPhaseEnd - rlPhaseStartTest "gz" - rlAssertNotDiffer "reference/gz/abc1.gz.ref" "tmp/gz/abc1.gz.my" - rlAssertNotDiffer "reference/gz/abc2.gz.ref" "tmp/gz/abc2.gz.my" - rlAssertNotDiffer "reference/gz/a.gz.ref" "tmp/gz/a.gz.my" + rlPhaseStartTest 'hlp' + compare 'hlp/biochlr2.hlp' rlPhaseEnd - rlPhaseStartTest "h" - rlAssertNotDiffer "reference/h/a.h.ref" "tmp/h/a.h.my" - rlAssertNotDiffer "reference/h/basic_string.h.ref" "tmp/h/basic_string.h.my" - rlAssertNotDiffer "reference/h/gclosure.h.ref" "tmp/h/gclosure.h.my" - rlAssertNotDiffer "reference/h/gfileattribute.h.ref" "tmp/h/gfileattribute.h.my" - rlAssertNotDiffer "reference/h/gfile.h.ref" "tmp/h/gfile.h.my" - rlAssertNotDiffer "reference/h/gsocketaddressenumerator.h.ref" "tmp/h/gsocketaddressenumerator.h.my" - rlAssertNotDiffer "reference/h/gunixmounts.h.ref" "tmp/h/gunixmounts.h.my" - rlAssertNotDiffer "reference/h/stl_map.h.ref" "tmp/h/stl_map.h.my" - rlAssertNotDiffer "reference/h/stl_queue.h.ref" "tmp/h/stl_queue.h.my" - rlAssertNotDiffer "reference/h/stl_stack.h.ref" "tmp/h/stl_stack.h.my" + rlPhaseStartTest 'hta' + compare 'hta/access.hta' + compare 'hta/hello_world.hta' rlPhaseEnd - rlPhaseStartTest "hlp" - rlAssertNotDiffer "reference/hlp/biochlr2.hlp.ref" "tmp/hlp/biochlr2.hlp.my" + rlPhaseStartTest 'html' + compare 'html/index_first4k.html' rlPhaseEnd - rlPhaseStartTest "hta" - rlAssertNotDiffer "reference/hta/access.hta.ref" "tmp/hta/access.hta.my" - rlAssertNotDiffer "reference/hta/hello_world.hta.ref" "tmp/hta/hello_world.hta.my" + rlPhaseStartTest 'icm' + compare 'icm/bluish.icc' + compare 'icm/sRGB.icm' rlPhaseEnd - rlPhaseStartTest "html" - rlAssertNotDiffer "reference/html/index_first4k.html.ref" "tmp/html/index_first4k.html.my" + rlPhaseStartTest 'ico' + compare 'ico/pixel-install.ico' rlPhaseEnd - rlPhaseStartTest "chm" - rlAssertNotDiffer "reference/chm/index_start.chm.ref" "tmp/chm/index_start.chm.my" + rlPhaseStartTest 'img' + compare 'img/initrd1.img' + compare 'img/qcow2_v2.qcow2' + compare 'img/qcow2_v3.qcow2' + compare 'img/qcow_v1.qcow' + compare 'img/qed.img' + compare 'img/vdi.img' rlPhaseEnd - rlPhaseStartTest "icm" - rlAssertNotDiffer "reference/icm/bluish.icc.ref" "tmp/icm/bluish.icc.my" - rlAssertNotDiffer "reference/icm/sRGB.icm.ref" "tmp/icm/sRGB.icm.my" + rlPhaseStartTest 'ins' + compare 'ins/internet_connection_settings.ins' + compare 'ins/setup.ins' rlPhaseEnd - rlPhaseStartTest "ico" - rlAssertNotDiffer "reference/ico/pixel-install.ico.ref" "tmp/ico/pixel-install.ico.my" + rlPhaseStartTest 'iso' + compare 'iso/x.iso' rlPhaseEnd - rlPhaseStartTest "img" - rlAssertNotDiffer "reference/img/initrd1.img.ref" "tmp/img/initrd1.img.my" - rlAssertNotDiffer "reference/img/qed.img.ref" "tmp/img/qed.img.my" - rlAssertNotDiffer "reference/img/vdi.img.ref" "tmp/img/vdi.img.my" + rlPhaseStartTest 'isp' + compare 'isp/self-created.isp' rlPhaseEnd - rlPhaseStartTest "ins" - rlAssertNotDiffer "reference/ins/internet_connection_settings.ins.ref" "tmp/ins/internet_connection_settings.ins.my" - rlAssertNotDiffer "reference/ins/setup.ins.ref" "tmp/ins/setup.ins.my" + rlPhaseStartTest 'java' + compare 'java/CreateMdb.java' rlPhaseEnd - rlPhaseStartTest "iso" - rlAssertNotDiffer "reference/iso/x.iso.ref" "tmp/iso/x.iso.my" + rlPhaseStartTest 'jpc' + compare 'jpc/testing.jpc' + compare 'jpc/test.jpc' rlPhaseEnd - rlPhaseStartTest "isp" - rlAssertNotDiffer "reference/isp/self-created.isp.ref" "tmp/isp/self-created.isp.my" + rlPhaseStartTest 'jpg' + compare 'jpg/lime-cat.jpg' rlPhaseEnd - rlPhaseStartTest "java" - rlAssertNotDiffer "reference/java/CreateMdb.java.ref" "tmp/java/CreateMdb.java.my" + rlPhaseStartTest 'js' + compare 'js/smartmobile.js' rlPhaseEnd - rlPhaseStartTest "jpc" - rlAssertNotDiffer "reference/jpc/testing.jpc.ref" "tmp/jpc/testing.jpc.my" - rlAssertNotDiffer "reference/jpc/test.jpc.ref" "tmp/jpc/test.jpc.my" + rlPhaseStartTest 'jse' + compare 'jse/smartmobile.jse' rlPhaseEnd - rlPhaseStartTest "jpg" - rlAssertNotDiffer "reference/jpg/lime-cat.jpg.ref" "tmp/jpg/lime-cat.jpg.my" + rlPhaseStartTest 'json' + compare 'json/1.json-keep' + compare 'json/2.json-keep' + compare 'json/3.json-keep' + compare 'json/4.json-keep' + compare 'json/5.json-keep' rlPhaseEnd - rlPhaseStartTest "js" - rlAssertNotDiffer "reference/js/smartmobile.js.ref" "tmp/js/smartmobile.js.my" + rlPhaseStartTest 'kernels' + compare 'kernels/s390x' + compare 'kernels/x86_64' rlPhaseEnd - rlPhaseStartTest "jse" - rlAssertNotDiffer "reference/jse/smartmobile.jse.ref" "tmp/jse/smartmobile.jse.my" + rlPhaseStartTest 'lnk' rlPhaseEnd - rlPhaseStartTest "kernels" - rlAssertNotDiffer "reference/kernels/s390x.ref" "tmp/kernels/s390x.my" - rlAssertNotDiffer "reference/kernels/x86_64.ref" "tmp/kernels/x86_64.my" + rlPhaseStartTest 'locale' + compare 'locale/LC_ADDRESS' + compare 'locale/LC_COLLATE' + compare 'locale/LC_CTYPE' + compare 'locale/LC_IDENTIFICATION' + compare 'locale/LC_MEASUREMENT' + compare 'locale/LC_MONETARY' + compare 'locale/LC_NAME' + compare 'locale/LC_NUMERIC' + compare 'locale/LC_PAPER' + compare 'locale/LC_TELEPHONE' + compare 'locale/LC_TIME' rlPhaseEnd - rlPhaseStartTest "lnk" + rlPhaseStartTest 'lsm' + compare 'lsm/sysstate.lsm' rlPhaseEnd - rlPhaseStartTest "lsm" - rlAssertNotDiffer "reference/lsm/sysstate.lsm.ref" "tmp/lsm/sysstate.lsm.my" + rlPhaseStartTest 'lua' + compare 'lua/mod_actions_http.lua' rlPhaseEnd - rlPhaseStartTest "lua" - rlAssertNotDiffer "reference/lua/mod_actions_http.lua.ref" "tmp/lua/mod_actions_http.lua.my" + rlPhaseStartTest 'mach-o' rlPhaseEnd - rlPhaseStartTest "mach-o" - rlAssertNotDiffer "reference/mach-o/PythonLauncher.ref" "tmp/mach-o/PythonLauncher.my" + rlPhaseStartTest 'mc' + compare 'mc/submit.mc' rlPhaseEnd - rlPhaseStartTest "mc" - rlAssertNotDiffer "reference/mc/submit.mc.ref" "tmp/mc/submit.mc.my" + rlPhaseStartTest 'mdb' + compare 'mdb/a.mdb' + compare 'mdb/self-created.mdb' rlPhaseEnd - rlPhaseStartTest "mdb" - rlAssertNotDiffer "reference/mdb/a.mdb.ref" "tmp/mdb/a.mdb.my" - rlAssertNotDiffer "reference/mdb/self-created.mdb.ref" "tmp/mdb/self-created.mdb.my" + rlPhaseStartTest 'mde' + compare 'mde/encoded_db.mde' rlPhaseEnd - rlPhaseStartTest "mde" - rlAssertNotDiffer "reference/mde/encoded_db.mde.ref" "tmp/mde/encoded_db.mde.my" + rlPhaseStartTest 'mid' + compare 'mid/notes.mid' rlPhaseEnd - rlPhaseStartTest "mid" - rlAssertNotDiffer "reference/mid/notes.mid.ref" "tmp/mid/notes.mid.my" + rlPhaseStartTest 'misc' + compare 'misc/ansi2knr' + compare 'misc/core' + compare 'misc/core2' + compare 'misc/mysql-bin-replication-log' + compare 'misc/openvpn' + compare 'misc/p_cert' + compare 'misc/p_clear' + compare 'misc/p_pass' + compare 'misc/RPM-GPG-KEY-fedora-14-primary' + compare 'misc/scc-text' + compare 'misc/selinux_policy' + compare 'misc/zeros' rlPhaseEnd - rlPhaseStartTest "misc" - rlAssertNotDiffer "reference/misc/ansi2knr.ref" "tmp/misc/ansi2knr.my" - rlAssertNotDiffer "reference/misc/core.ref" "tmp/misc/core.my" - rlAssertNotDiffer "reference/misc/core2.ref" "tmp/misc/core2.my" - rlAssertNotDiffer "reference/misc/mysql-bin-replication-log.ref" "tmp/misc/mysql-bin-replication-log.my" - rlAssertNotDiffer "reference/misc/openvpn.ref" "tmp/misc/openvpn.my" - rlAssertNotDiffer "reference/misc/p_cert.ref" "tmp/misc/p_cert.my" - rlAssertNotDiffer "reference/misc/p_clear.ref" "tmp/misc/p_clear.my" - rlAssertNotDiffer "reference/misc/p_pass.ref" "tmp/misc/p_pass.my" - rlAssertNotDiffer "reference/misc/RPM-GPG-KEY-fedora-14-primary.ref" "tmp/misc/RPM-GPG-KEY-fedora-14-primary.my" - rlAssertNotDiffer "reference/misc/scc-text.ref" "tmp/misc/scc-text.my" - rlAssertNotDiffer "reference/misc/selinux_policy.ref" "tmp/misc/selinux_policy.my" - rlAssertNotDiffer "reference/misc/zeros.ref" "tmp/misc/zeros.my" + rlPhaseStartTest 'mkv' + compare 'mkv/matroska_test.mkv' + compare 'mkv/sample.mkv' rlPhaseEnd - rlPhaseStartTest "mkv" - rlAssertNotDiffer "reference/mkv/matroska_test.mkv.ref" "tmp/mkv/matroska_test.mkv.my" - rlAssertNotDiffer "reference/mkv/sample.mkv.ref" "tmp/mkv/sample.mkv.my" + rlPhaseStartTest 'mng' + compare 'mng/jabber_connecting.mng' rlPhaseEnd - rlPhaseStartTest "mng" - rlAssertNotDiffer "reference/mng/jabber_connecting.mng.ref" "tmp/mng/jabber_connecting.mng.my" + rlPhaseStartTest 'mo' + compare 'mo/a.mo' rlPhaseEnd - rlPhaseStartTest "mo" - rlAssertNotDiffer "reference/mo/a.mo.ref" "tmp/mo/a.mo.my" + rlPhaseStartTest 'mono' + compare 'mono/Mono.TextTemplating.dll' + compare 'mono/TextTransform.exe' rlPhaseEnd - rlPhaseStartTest "mono" - rlAssertNotDiffer "reference/mono/Mono.TextTemplating.dll.ref" "tmp/mono/Mono.TextTemplating.dll.my" - rlAssertNotDiffer "reference/mono/TextTransform.exe.ref" "tmp/mono/TextTransform.exe.my" + rlPhaseStartTest 'mp3' + compare 'mp3/house_lo.mp3' rlPhaseEnd - rlPhaseStartTest "mp3" - rlAssertNotDiffer "reference/mp3/house_lo.mp3.ref" "tmp/mp3/house_lo.mp3.my" + rlPhaseStartTest 'msc' + compare 'msc/ms_management_console.msc' rlPhaseEnd - rlPhaseStartTest "msc" - rlAssertNotDiffer "reference/msc/ms_management_console.msc.ref" "tmp/msc/ms_management_console.msc.my" + rlPhaseStartTest 'msi' + compare 'msi/SampleFirst_full.msi' rlPhaseEnd - rlPhaseStartTest "msi" - rlAssertNotDiffer "reference/msi/SampleFirst_full.msi.ref" "tmp/msi/SampleFirst_full.msi.my" + rlPhaseStartTest 'msp' + compare 'msp/Patch_full.msp' rlPhaseEnd - rlPhaseStartTest "msp" - rlAssertNotDiffer "reference/msp/Patch_full.msp.ref" "tmp/msp/Patch_full.msp.my" + rlPhaseStartTest 'mst' + compare 'mst/wix_transform_full.mst' rlPhaseEnd - rlPhaseStartTest "mst" - rlAssertNotDiffer "reference/mst/wix_transform_full.mst.ref" "tmp/mst/wix_transform_full.mst.my" + rlPhaseStartTest 'myi' + compare 'myi/event.MYI' rlPhaseEnd - rlPhaseStartTest "myi" - rlAssertNotDiffer "reference/myi/event.MYI.ref" "tmp/myi/event.MYI.my" + rlPhaseStartTest 'ods' + compare 'ods/test.ods' rlPhaseEnd - rlPhaseStartTest "ods" - rlAssertNotDiffer "reference/ods/test.ods.ref" "tmp/ods/test.ods.my" + rlPhaseStartTest 'ogg' + compare 'ogg/fiba1.ogg' rlPhaseEnd - rlPhaseStartTest "ogg" - rlAssertNotDiffer "reference/ogg/fiba1.ogg.ref" "tmp/ogg/fiba1.ogg.my" + rlPhaseStartTest 'patch' + compare 'patch/a.patch' + compare 'patch/b.patch' + compare 'patch/parser571033.patch' rlPhaseEnd - rlPhaseStartTest "patch" - rlAssertNotDiffer "reference/patch/a.patch.ref" "tmp/patch/a.patch.my" - rlAssertNotDiffer "reference/patch/b.patch.ref" "tmp/patch/b.patch.my" - rlAssertNotDiffer "reference/patch/parser571033.patch.ref" "tmp/patch/parser571033.patch.my" + rlPhaseStartTest 'pbm' rlPhaseEnd - rlPhaseStartTest "pbm" + rlPhaseStartTest 'pcd' + compare 'pcd/photo_cd.pcd' rlPhaseEnd - rlPhaseStartTest "pcd" - rlAssertNotDiffer "reference/pcd/photo_cd.pcd.ref" "tmp/pcd/photo_cd.pcd.my" + rlPhaseStartTest 'pdf' + compare 'pdf/mailman-admin.pdf' rlPhaseEnd - rlPhaseStartTest "pdf" - rlAssertNotDiffer "reference/pdf/mailman-admin.pdf.ref" "tmp/pdf/mailman-admin.pdf.my" + rlPhaseStartTest 'pfa' + compare 'pfa/bchb.pfa' rlPhaseEnd - rlPhaseStartTest "pfa" - rlAssertNotDiffer "reference/pfa/bchb.pfa.ref" "tmp/pfa/bchb.pfa.my" + rlPhaseStartTest 'pfb' + compare 'pfb/a010013l.pfb' rlPhaseEnd - rlPhaseStartTest "pfb" - rlAssertNotDiffer "reference/pfb/a010013l.pfb.ref" "tmp/pfb/a010013l.pfb.my" + rlPhaseStartTest 'pif' + compare 'pif/command.pif' rlPhaseEnd - rlPhaseStartTest "pif" - rlAssertNotDiffer "reference/pif/command.pif.ref" "tmp/pif/command.pif.my" + rlPhaseStartTest 'pl' + compare 'pl/apxs' + compare 'pl/arg_shebang.pl' + compare 'pl/ConfigLocal_PM.pl' + compare 'pl/enc2xs' + compare 'pl/Makefile_PL.pl' rlPhaseEnd - rlPhaseStartTest "pl" - rlAssertNotDiffer "reference/pl/apxs.ref" "tmp/pl/apxs.my" - rlAssertNotDiffer "reference/pl/arg_shebang.pl.ref" "tmp/pl/arg_shebang.pl.my" - rlAssertNotDiffer "reference/pl/ConfigLocal_PM.pl.ref" "tmp/pl/ConfigLocal_PM.pl.my" - rlAssertNotDiffer "reference/pl/enc2xs.ref" "tmp/pl/enc2xs.my" - rlAssertNotDiffer "reference/pl/Makefile_PL.pl.ref" "tmp/pl/Makefile_PL.pl.my" + rlPhaseStartTest 'pm' + compare 'pm/Find.pm' + compare 'pm/Html.pm' + compare 'pm/Select.pm' rlPhaseEnd - rlPhaseStartTest "pm" - rlAssertNotDiffer "reference/pm/Find.pm.ref" "tmp/pm/Find.pm.my" - rlAssertNotDiffer "reference/pm/Html.pm.ref" "tmp/pm/Html.pm.my" - rlAssertNotDiffer "reference/pm/Select.pm.ref" "tmp/pm/Select.pm.my" + rlPhaseStartTest 'png' + compare 'png/adhoc1.png' rlPhaseEnd - rlPhaseStartTest "png" - rlAssertNotDiffer "reference/png/adhoc1.png.ref" "tmp/png/adhoc1.png.my" + rlPhaseStartTest 'po' + compare 'po/rev0.0.po' + compare 'po/rev0.1.po' + compare 'po/rev1.1.po' + compare 'po/test.po' rlPhaseEnd - rlPhaseStartTest "po" - rlAssertNotDiffer "reference/po/rev0.0.po.ref" "tmp/po/rev0.0.po.my" - rlAssertNotDiffer "reference/po/rev0.1.po.ref" "tmp/po/rev0.1.po.my" - rlAssertNotDiffer "reference/po/rev1.1.po.ref" "tmp/po/rev1.1.po.my" - rlAssertNotDiffer "reference/po/test.po.ref" "tmp/po/test.po.my" + rlPhaseStartTest 'pot' + compare 'pot/presentation.pot' + compare 'pot/presentation_with_autostart_macro.pot' rlPhaseEnd - rlPhaseStartTest "pot" - rlAssertNotDiffer "reference/pot/presentation.pot.ref" "tmp/pot/presentation.pot.my" - rlAssertNotDiffer "reference/pot/presentation_with_autostart_macro.pot.ref" "tmp/pot/presentation_with_autostart_macro.pot.my" + rlPhaseStartTest 'potm' + compare 'potm/presentation.potm' + compare 'potm/presentation_with_autostart_macro.potm' rlPhaseEnd - rlPhaseStartTest "potm" - rlAssertNotDiffer "reference/potm/presentation.potm.ref" "tmp/potm/presentation.potm.my" - rlAssertNotDiffer "reference/potm/presentation_with_autostart_macro.potm.ref" "tmp/potm/presentation_with_autostart_macro.potm.my" + rlPhaseStartTest 'potx' + compare 'potx/presentation.potx' rlPhaseEnd - rlPhaseStartTest "potx" - rlAssertNotDiffer "reference/potx/presentation.potx.ref" "tmp/potx/presentation.potx.my" + rlPhaseStartTest 'ppa' + compare 'ppa/presentation_non_auto_macros.ppa' rlPhaseEnd - rlPhaseStartTest "ppa" - rlAssertNotDiffer "reference/ppa/presentation_non_auto_macros.ppa.ref" "tmp/ppa/presentation_non_auto_macros.ppa.my" + rlPhaseStartTest 'ppam' + compare 'ppam/presentation_non_auto_macros.ppam' rlPhaseEnd - rlPhaseStartTest "ppam" - rlAssertNotDiffer "reference/ppam/presentation_non_auto_macros.ppam.ref" "tmp/ppam/presentation_non_auto_macros.ppam.my" + rlPhaseStartTest 'ppc' + compare 'ppc/coredump-ppc' rlPhaseEnd - rlPhaseStartTest "ppd" - rlAssertNotDiffer "reference/ppd/Generic-PDF_Printer-PDF.ppd.ref" "tmp/ppd/Generic-PDF_Printer-PDF.ppd.my" + rlPhaseStartTest 'ppd' + compare 'ppd/Generic-PDF_Printer-PDF.ppd' rlPhaseEnd - rlPhaseStartTest "ppm" - rlAssertNotDiffer "reference/ppm/a.ppm.ref" "tmp/ppm/a.ppm.my" + rlPhaseStartTest 'ppm' + compare 'ppm/a.ppm' rlPhaseEnd - rlPhaseStartTest "pps" - rlAssertNotDiffer "reference/pps/presentation.pps.ref" "tmp/pps/presentation.pps.my" - rlAssertNotDiffer "reference/pps/presentation_with_autostart_macro.pps.ref" "tmp/pps/presentation_with_autostart_macro.pps.my" + rlPhaseStartTest 'pps' + compare 'pps/presentation.pps' + compare 'pps/presentation_with_autostart_macro.pps' rlPhaseEnd - rlPhaseStartTest "ppsm" - rlAssertNotDiffer "reference/ppsm/presentation.ppsm.ref" "tmp/ppsm/presentation.ppsm.my" - rlAssertNotDiffer "reference/ppsm/presentation_with_autostart_macro.ppsm.ref" "tmp/ppsm/presentation_with_autostart_macro.ppsm.my" + rlPhaseStartTest 'ppsm' + compare 'ppsm/presentation.ppsm' + compare 'ppsm/presentation_with_autostart_macro.ppsm' rlPhaseEnd - rlPhaseStartTest "ppsx" - rlAssertNotDiffer "reference/ppsx/presentation.ppsx.ref" "tmp/ppsx/presentation.ppsx.my" + rlPhaseStartTest 'ppsx' + compare 'ppsx/presentation.ppsx' rlPhaseEnd - rlPhaseStartTest "ppt" - rlAssertNotDiffer "reference/ppt/encrypted.ppt.ref" "tmp/ppt/encrypted.ppt.my" - rlAssertNotDiffer "reference/ppt/presentation.ppt.ref" "tmp/ppt/presentation.ppt.my" - rlAssertNotDiffer "reference/ppt/presentation_with_autostart_macro.ppt.ref" "tmp/ppt/presentation_with_autostart_macro.ppt.my" + rlPhaseStartTest 'ppt' + compare 'ppt/encrypted.ppt' + compare 'ppt/presentation.ppt' + compare 'ppt/presentation_with_autostart_macro.ppt' rlPhaseEnd - rlPhaseStartTest "pptm" - rlAssertNotDiffer "reference/pptm/encrypted.pptm.ref" "tmp/pptm/encrypted.pptm.my" - rlAssertNotDiffer "reference/pptm/presentation.pptm.ref" "tmp/pptm/presentation.pptm.my" - rlAssertNotDiffer "reference/pptm/presentation_with_autostart_macro.pptm.ref" "tmp/pptm/presentation_with_autostart_macro.pptm.my" + rlPhaseStartTest 'pptm' + compare 'pptm/encrypted.pptm' + compare 'pptm/presentation.pptm' + compare 'pptm/presentation_with_autostart_macro.pptm' rlPhaseEnd - rlPhaseStartTest "pptx" - rlAssertNotDiffer "reference/pptx/encrypted.pptx.ref" "tmp/pptx/encrypted.pptx.my" - rlAssertNotDiffer "reference/pptx/presentation.pptx.ref" "tmp/pptx/presentation.pptx.my" + rlPhaseStartTest 'pptx' + compare 'pptx/encrypted.pptx' + compare 'pptx/presentation.pptx' rlPhaseEnd - rlPhaseStartTest "ps" - rlAssertNotDiffer "reference/ps/filtered-test.ps.ref" "tmp/ps/filtered-test.ps.my" + rlPhaseStartTest 'ps' + compare 'ps/filtered-test.ps' rlPhaseEnd - rlPhaseStartTest "py" - rlAssertNotDiffer "reference/py/gtk_label_autowrap.py.ref" "tmp/py/gtk_label_autowrap.py.my" - rlAssertNotDiffer "reference/py/music.py.ref" "tmp/py/music.py.my" - rlAssertNotDiffer "reference/py/Switchboard.py.ref" "tmp/py/Switchboard.py.my" + rlPhaseStartTest 'py' + compare 'py/gtk_label_autowrap.py' + compare 'py/music.py' + compare 'py/p1.py' + compare 'py/p2.py' + compare 'py/p3.py' + compare 'py/p4.py' + compare 'py/p5.py' + compare 'py/p6.py' + compare 'py/Switchboard.py' rlPhaseEnd - rlPhaseStartTest "pyc" - rlAssertNotDiffer "reference/pyc/config.pyc.ref" "tmp/pyc/config.pyc.my" - rlAssertNotDiffer "reference/pyc/handle.pyc.ref" "tmp/pyc/handle.pyc.my" + rlPhaseStartTest 'pyc' + compare 'pyc/config.pyc' + compare 'pyc/handle.pyc' rlPhaseEnd - rlPhaseStartTest "rar" - rlAssertNotDiffer "reference/rar/encrypted-hidden-filenames.rar.ref" "tmp/rar/encrypted-hidden-filenames.rar.my" - rlAssertNotDiffer "reference/rar/encrypted.rar.ref" "tmp/rar/encrypted.rar.my" - rlAssertNotDiffer "reference/rar/normal.rar.ref" "tmp/rar/normal.rar.my" - rlAssertNotDiffer "reference/rar/rar-v4-archive.rar.ref" "tmp/rar/rar-v4-archive.rar.my" + rlPhaseStartTest 'rar' + compare 'rar/encrypted-hidden-filenames.rar' + compare 'rar/encrypted.rar' + compare 'rar/normal.rar' + compare 'rar/rar-v4-archive.rar' rlPhaseEnd - rlPhaseStartTest "rb" - rlAssertNotDiffer "reference/rb/docbook.rb.ref" "tmp/rb/docbook.rb.my" + rlPhaseStartTest 'rb' + compare 'rb/docbook.rb' rlPhaseEnd - rlPhaseStartTest "reg" - rlAssertNotDiffer "reference/reg/windows_registry.reg.ref" "tmp/reg/windows_registry.reg.my" + rlPhaseStartTest 'reg' + compare 'reg/windows_registry.reg' rlPhaseEnd - rlPhaseStartTest "rpm" - rlAssertNotDiffer "reference/rpm/a.rpm.ref" "tmp/rpm/a.rpm.my" - rlAssertNotDiffer "reference/rpm/ppc.rpm.ref" "tmp/rpm/ppc.rpm.my" - rlAssertNotDiffer "reference/rpm/ppc64.rpm.ref" "tmp/rpm/ppc64.rpm.my" - rlAssertNotDiffer "reference/rpm/src.rpm.ref" "tmp/rpm/src.rpm.my" - rlAssertNotDiffer "reference/rpm/s390.rpm.ref" "tmp/rpm/s390.rpm.my" - rlAssertNotDiffer "reference/rpm/s390x.rpm.ref" "tmp/rpm/s390x.rpm.my" + rlPhaseStartTest 'rpm' + compare 'rpm/a.rpm' + compare 'rpm/ppc64.rpm' + compare 'rpm/ppc.rpm' + compare 'rpm/s390.rpm' + compare 'rpm/s390x.rpm' + compare 'rpm/src.rpm' rlPhaseEnd - rlPhaseStartTest "rtf" - rlAssertNotDiffer "reference/rtf/word_document.rtf.ref" "tmp/rtf/word_document.rtf.my" + rlPhaseStartTest 'rtf' + compare 'rtf/word_document.rtf' rlPhaseEnd - rlPhaseStartTest "s" - rlAssertNotDiffer "reference/s/boring-asm.s.ref" "tmp/s/boring-asm.s.my" + rlPhaseStartTest 's' + compare 's/boring-asm.s' rlPhaseEnd - rlPhaseStartTest "scr" - rlAssertNotDiffer "reference/scr/SlideShow.scr.ref" "tmp/scr/SlideShow.scr.my" + rlPhaseStartTest 'scr' + compare 'scr/SlideShow.scr' rlPhaseEnd - rlPhaseStartTest "sct" - rlAssertNotDiffer "reference/sct/editor_addin.sct.ref" "tmp/sct/editor_addin.sct.my" + rlPhaseStartTest 'sct' + compare 'sct/editor_addin.sct' rlPhaseEnd - rlPhaseStartTest "shb" - rlAssertNotDiffer "reference/shb/win_document_shortcut_full.shb.ref" "tmp/shb/win_document_shortcut_full.shb.my" + rlPhaseStartTest 'shb' + compare 'shb/win_document_shortcut_full.shb' rlPhaseEnd - rlPhaseStartTest "shs" - rlAssertNotDiffer "reference/shs/win_scrap_file_full.shs.ref" "tmp/shs/win_scrap_file_full.shs.my" + rlPhaseStartTest 'shs' + compare 'shs/win_scrap_file_full.shs' rlPhaseEnd - rlPhaseStartTest "so" - rlAssertNotDiffer "reference/so/libtables.so.ref" "tmp/so/libtables.so.my" + rlPhaseStartTest 'slk' + compare 'slk/excel4_sample_macro.slk' + compare 'slk/simple-slk-file.slk' rlPhaseEnd - rlPhaseStartTest "svg" - rlAssertNotDiffer "reference/svg/esc.svg.ref" "tmp/svg/esc.svg.my" + rlPhaseStartTest 'so' + compare 'so/libtables.so' rlPhaseEnd - rlPhaseStartTest "tar.gz" + rlPhaseStartTest 'svg' + compare 'svg/esc.svg' rlPhaseEnd - rlPhaseStartTest "tdb" - rlAssertNotDiffer "reference/tdb/test.tdb.ref" "tmp/tdb/test.tdb.my" + rlPhaseStartTest 'tar.gz' rlPhaseEnd - rlPhaseStartTest "tex" - rlAssertNotDiffer "reference/tex/pl-refcard.tex.ref" "tmp/tex/pl-refcard.tex.my" - rlAssertNotDiffer "reference/tex/sk-survival.tex.ref" "tmp/tex/sk-survival.tex.my" - rlAssertNotDiffer "reference/tex/test_latex.tex.ref" "tmp/tex/test_latex.tex.my" + rlPhaseStartTest 'tdb' + compare 'tdb/test.tdb' rlPhaseEnd - rlPhaseStartTest "tga" - rlAssertNotDiffer "reference/tga/bloom.tga.ref" "tmp/tga/bloom.tga.my" - rlAssertNotDiffer "reference/tga/Font.tga.ref" "tmp/tga/Font.tga.my" + rlPhaseStartTest 'tex' + compare 'tex/pl-refcard.tex' + compare 'tex/sk-survival.tex' + compare 'tex/test_latex.tex' rlPhaseEnd - rlPhaseStartTest "tgz" + rlPhaseStartTest 'tga' + compare 'tga/bloom.tga' + compare 'tga/Font.tga' rlPhaseEnd - rlPhaseStartTest "thmx" - rlAssertNotDiffer "reference/thmx/presentation.thmx.ref" "tmp/thmx/presentation.thmx.my" + rlPhaseStartTest 'tgz' rlPhaseEnd - rlPhaseStartTest "tif" - rlAssertNotDiffer "reference/tif/note.tif.ref" "tmp/tif/note.tif.my" + rlPhaseStartTest 'thmx' + compare 'thmx/presentation.thmx' rlPhaseEnd - rlPhaseStartTest "timezone" - rlAssertNotDiffer "reference/timezone/localtime.ref" "tmp/timezone/localtime.my" + rlPhaseStartTest 'tif' + compare 'tif/note.tif' rlPhaseEnd - rlPhaseStartTest "ts" - rlAssertNotDiffer "reference/ts/test1.ts.ref" "tmp/ts/test1.ts.my" - rlAssertNotDiffer "reference/ts/test2.ts.ref" "tmp/ts/test2.ts.my" - rlAssertNotDiffer "reference/ts/test3.ts.ref" "tmp/ts/test3.ts.my" + rlPhaseStartTest 'timezone' + compare 'timezone/localtime' rlPhaseEnd - rlPhaseStartTest "ttf" - rlAssertNotDiffer "reference/ttf/NanumGothic.ttf.ref" "tmp/ttf/NanumGothic.ttf.my" + rlPhaseStartTest 'ts' + compare 'ts/test1.ts' + compare 'ts/test2.ts' + compare 'ts/test3.ts' rlPhaseEnd - rlPhaseStartTest "txt" - rlAssertNotDiffer "reference/txt/dsn_15.txt.ref" "tmp/txt/dsn_15.txt.my" - rlAssertNotDiffer "reference/txt/magic-bug-sample.txt.ref" "tmp/txt/magic-bug-sample.txt.my" - rlAssertNotDiffer "reference/txt/msg-6505-1.txt.ref" "tmp/txt/msg-6505-1.txt.my" - rlAssertNotDiffer "reference/txt/timestamp.txt.ref" "tmp/txt/timestamp.txt.my" + rlPhaseStartTest 'ttf' + compare 'ttf/NanumGothic.ttf' rlPhaseEnd - rlPhaseStartTest "ulaw" - rlAssertNotDiffer "reference/ulaw/star.ulaw.ref" "tmp/ulaw/star.ulaw.my" + rlPhaseStartTest 'txt' + compare 'txt/dsn_15.txt' + compare 'txt/magic-bug-sample.txt' + compare 'txt/msg-6505-1.txt' + compare 'txt/timestamp.txt' rlPhaseEnd - rlPhaseStartTest "vb" - rlAssertNotDiffer "reference/vb/HelloWorld.vb.ref" "tmp/vb/HelloWorld.vb.my" + rlPhaseStartTest 'ulaw' + compare 'ulaw/star.ulaw' rlPhaseEnd - rlPhaseStartTest "vbe" - rlAssertNotDiffer "reference/vbe/DateName.vbe.ref" "tmp/vbe/DateName.vbe.my" + rlPhaseStartTest 'vb' + compare 'vb/HelloWorld.vb' rlPhaseEnd - rlPhaseStartTest "vbs" - rlAssertNotDiffer "reference/vbs/DateName.vbs.ref" "tmp/vbs/DateName.vbs.my" + rlPhaseStartTest 'vbe' + compare 'vbe/DateName.vbe' rlPhaseEnd - rlPhaseStartTest "wav" - rlAssertNotDiffer "reference/wav/b0456.wav.ref" "tmp/wav/b0456.wav.my" - rlAssertNotDiffer "reference/wav/send.wav.ref" "tmp/wav/send.wav.my" + rlPhaseStartTest 'vbs' + compare 'vbs/DateName.vbs' rlPhaseEnd - rlPhaseStartTest "webm" + rlPhaseStartTest 'wav' + compare 'wav/b0456.wav' + compare 'wav/send.wav' rlPhaseEnd - rlPhaseStartTest "wmv" - rlAssertNotDiffer "reference/wmv/presentation.wmv.ref" "tmp/wmv/presentation.wmv.my" + rlPhaseStartTest 'webm' rlPhaseEnd - rlPhaseStartTest "wps" - rlAssertNotDiffer "reference/wps/word_document.wps.ref" "tmp/wps/word_document.wps.my" + rlPhaseStartTest 'wmv' + compare 'wmv/presentation.wmv' rlPhaseEnd - rlPhaseStartTest "wsc" - rlAssertNotDiffer "reference/wsc/HelloWorld.wsc.ref" "tmp/wsc/HelloWorld.wsc.my" + rlPhaseStartTest 'wps' + compare 'wps/word_document.wps' rlPhaseEnd - rlPhaseStartTest "wsf" - rlAssertNotDiffer "reference/wsf/HelloWorld.wsf.ref" "tmp/wsf/HelloWorld.wsf.my" + rlPhaseStartTest 'wsc' + compare 'wsc/HelloWorld.wsc' rlPhaseEnd - rlPhaseStartTest "wsh" - rlAssertNotDiffer "reference/wsh/HelloWorld.wsh.ref" "tmp/wsh/HelloWorld.wsh.my" + rlPhaseStartTest 'wsf' + compare 'wsf/HelloWorld.wsf' rlPhaseEnd - rlPhaseStartTest "xlam" - rlAssertNotDiffer "reference/xlam/calculation.xlam.ref" "tmp/xlam/calculation.xlam.my" + rlPhaseStartTest 'wsh' + compare 'wsh/HelloWorld.wsh' rlPhaseEnd - rlPhaseStartTest "xls" - rlAssertNotDiffer "reference/xls/calculation-new-format.xls.ref" "tmp/xls/calculation-new-format.xls.my" - rlAssertNotDiffer "reference/xls/calculation-old-format.xls.ref" "tmp/xls/calculation-old-format.xls.my" - rlAssertNotDiffer "reference/xls/calculation_with_autostart_macro.xls.ref" "tmp/xls/calculation_with_autostart_macro.xls.my" + rlPhaseStartTest 'xlam' + compare 'xlam/calculation.xlam' rlPhaseEnd - rlPhaseStartTest "xlsb" - rlAssertNotDiffer "reference/xlsb/calculation_with_autostart_macro.xlsb.ref" "tmp/xlsb/calculation_with_autostart_macro.xlsb.my" - rlAssertNotDiffer "reference/xlsb/calculation.xlsb.ref" "tmp/xlsb/calculation.xlsb.my" - rlAssertNotDiffer "reference/xlsb/encrypted.xlsb.ref" "tmp/xlsb/encrypted.xlsb.my" + rlPhaseStartTest 'xls' + compare 'xls/calculation-new-format.xls' + compare 'xls/calculation-old-format.xls' + compare 'xls/calculation_with_autostart_macro.xls' rlPhaseEnd - rlPhaseStartTest "xlsm" - rlAssertNotDiffer "reference/xlsm/calculation_with_autostart_macro.xlsm.ref" "tmp/xlsm/calculation_with_autostart_macro.xlsm.my" - rlAssertNotDiffer "reference/xlsm/calculation.xlsm.ref" "tmp/xlsm/calculation.xlsm.my" - rlAssertNotDiffer "reference/xlsm/encrypted.xlsm.ref" "tmp/xlsm/encrypted.xlsm.my" + rlPhaseStartTest 'xlsb' + compare 'xlsb/calculation_with_autostart_macro.xlsb' + compare 'xlsb/calculation.xlsb' + compare 'xlsb/encrypted.xlsb' rlPhaseEnd - rlPhaseStartTest "xlsx" - rlAssertNotDiffer "reference/xlsx/calculation.xlsx.ref" "tmp/xlsx/calculation.xlsx.my" - rlAssertNotDiffer "reference/xlsx/encrypted.xlsx.ref" "tmp/xlsx/encrypted.xlsx.my" + rlPhaseStartTest 'xlsm' + compare 'xlsm/calculation_with_autostart_macro.xlsm' + compare 'xlsm/calculation.xlsm' + compare 'xlsm/encrypted.xlsm' rlPhaseEnd - rlPhaseStartTest "xlt" - rlAssertNotDiffer "reference/xlt/calculation.xlt.ref" "tmp/xlt/calculation.xlt.my" + rlPhaseStartTest 'xlsx' + compare 'xlsx/calculation.xlsx' + compare 'xlsx/encrypted.xlsx' rlPhaseEnd - rlPhaseStartTest "xltm" - rlAssertNotDiffer "reference/xltm/calculation.xltm.ref" "tmp/xltm/calculation.xltm.my" + rlPhaseStartTest 'xlt' + compare 'xlt/calculation.xlt' rlPhaseEnd - rlPhaseStartTest "xltx" - rlAssertNotDiffer "reference/xltx/calculation.xltx.ref" "tmp/xltx/calculation.xltx.my" + rlPhaseStartTest 'xltm' + compare 'xltm/calculation.xltm' rlPhaseEnd - rlPhaseStartTest "xml" - rlAssertNotDiffer "reference/xml/calculation.xml.ref" "tmp/xml/calculation.xml.my" - rlAssertNotDiffer "reference/xml/output.xml.ref" "tmp/xml/output.xml.my" - rlAssertNotDiffer "reference/xml/result.xml.ref" "tmp/xml/result.xml.my" - rlAssertNotDiffer "reference/xml/xmlutf16.xml.ref" "tmp/xml/xmlutf16.xml.my" + rlPhaseStartTest 'xltx' + compare 'xltx/calculation.xltx' rlPhaseEnd - rlPhaseStartTest "xps" + rlPhaseStartTest 'xml' + compare 'xml/calculation.xml' + compare 'xml/output.xml' + compare 'xml/result.xml' + compare 'xml/xmlutf16.xml' rlPhaseEnd - rlPhaseStartTest "xpt" - rlAssertNotDiffer "reference/xpt/calbase.xpt.ref" "tmp/xpt/calbase.xpt.my" + rlPhaseStartTest 'xps' rlPhaseEnd - rlPhaseStartTest "xsl" - rlAssertNotDiffer "reference/xsl/table.xsl.ref" "tmp/xsl/table.xsl.my" + rlPhaseStartTest 'xpt' + compare 'xpt/calbase.xpt' rlPhaseEnd - rlPhaseStartTest "zip" - rlAssertNotDiffer "reference/zip/empty.zip.ref" "tmp/zip/empty.zip.my" - rlAssertNotDiffer "reference/zip/stde.zip.ref" "tmp/zip/stde.zip.my" - rlAssertNotDiffer "reference/zip/VisualC.zip.ref" "tmp/zip/VisualC.zip.my" + rlPhaseStartTest 'xsl' + compare 'xsl/table.xsl' rlPhaseEnd - rlPhaseStartTest "z5" - rlAssertNotDiffer "reference/z5/Aisle.z5.ref" "tmp/z5/Aisle.z5.my" - rlAssertNotDiffer "reference/z5/guess.z5.ref" "tmp/z5/guess.z5.my" - rlAssertNotDiffer "reference/z5/stiffmst.z5.ref" "tmp/z5/stiffmst.z5.my" + rlPhaseStartTest 'z5' + compare 'z5/Aisle.z5' + compare 'z5/guess.z5' + compare 'z5/stiffmst.z5' rlPhaseEnd - rlPhaseStartTest "z7" - rlAssertNotDiffer "reference/z7/custard.z7.ref" "tmp/z7/custard.z7.my" + rlPhaseStartTest 'z7' + compare 'z7/custard.z7' rlPhaseEnd - rlPhaseStartTest "z8" - rlAssertNotDiffer "reference/z8/ats.z8.ref" "tmp/z8/ats.z8.my" + rlPhaseStartTest 'z8' + compare 'z8/ats.z8' rlPhaseEnd - rlPhaseStartTest "3ds" - rlAssertNotDiffer "reference/3ds/key.3DS.ref" "tmp/3ds/key.3DS.my" + rlPhaseStartTest 'zip' + compare 'zip/empty.zip' + compare 'zip/stde.zip' + compare 'zip/VisualC.zip' rlPhaseEnd - rlPhaseStartTest "7z" - rlAssertNotDiffer "reference/7z/spectrum.7z.ref" "tmp/7z/spectrum.7z.my" + rlPhaseStartCleanup + rm -rf "$TMPDIR" rlPhaseEnd rlJournalPrintText rlJournalEnd -rm -rf tmp \ No newline at end of file