From: Eric Biggers Date: Fri, 21 Jul 2017 04:22:05 +0000 (-0700) Subject: tests: clean up per-OS output files X-Git-Tag: v2022.05.01~1945 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48a473b5da5088036827d26f9dfb19618fca2cf0;p=xfstests-dev.git tests: clean up per-OS output files Some tests had separate output files for IRIX and Linux. Now that the IRIX ones have been removed, rename the Linux ones and remove the now-unneeded .cfg files and calls to _link_out_file. Signed-off-by: Eric Biggers Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/.gitignore b/.gitignore index c0736486..fcbc0cd4 100644 --- a/.gitignore +++ b/.gitignore @@ -234,19 +234,6 @@ /dmapi/src/suite2/src/test_rights # Symlinked files -/tests/generic/088.out -/tests/xfs/018.op -/tests/xfs/022.out -/tests/xfs/023.out -/tests/xfs/030.out -/tests/xfs/031.out /tests/xfs/033.out -/tests/xfs/035.out -/tests/xfs/036.out -/tests/xfs/039.out -/tests/xfs/043.out -/tests/xfs/055.out /tests/xfs/071.out -/tests/xfs/082.op /tests/xfs/096.out -/tests/xfs/146.out diff --git a/tests/generic/088 b/tests/generic/088 index 1f01c4f5..8d31741b 100755 --- a/tests/generic/088 +++ b/tests/generic/088 @@ -42,9 +42,6 @@ _filter() _filter_test_dir | sed -e '/----------/d' } -# link correct .out file -_link_out_file - # real QA test starts here _supported_fs generic _supported_os Linux diff --git a/tests/generic/088.cfg b/tests/generic/088.cfg deleted file mode 100644 index 7fd51a7d..00000000 --- a/tests/generic/088.cfg +++ /dev/null @@ -1 +0,0 @@ -linux: linux diff --git a/tests/generic/088.out b/tests/generic/088.out new file mode 100644 index 00000000..317c13fc --- /dev/null +++ b/tests/generic/088.out @@ -0,0 +1,9 @@ +QA output created by 088 +access(TEST_DIR/t_access, 0) returns 0 +access(TEST_DIR/t_access, R_OK) returns 0 +access(TEST_DIR/t_access, W_OK) returns 0 +access(TEST_DIR/t_access, X_OK) returns -1 +access(TEST_DIR/t_access, R_OK | W_OK) returns 0 +access(TEST_DIR/t_access, R_OK | X_OK) returns -1 +access(TEST_DIR/t_access, W_OK | X_OK) returns -1 +access(TEST_DIR/t_access, R_OK | W_OK | X_OK) returns -1 diff --git a/tests/generic/088.out.linux b/tests/generic/088.out.linux deleted file mode 100644 index 317c13fc..00000000 --- a/tests/generic/088.out.linux +++ /dev/null @@ -1,9 +0,0 @@ -QA output created by 088 -access(TEST_DIR/t_access, 0) returns 0 -access(TEST_DIR/t_access, R_OK) returns 0 -access(TEST_DIR/t_access, W_OK) returns 0 -access(TEST_DIR/t_access, X_OK) returns -1 -access(TEST_DIR/t_access, R_OK | W_OK) returns 0 -access(TEST_DIR/t_access, R_OK | X_OK) returns -1 -access(TEST_DIR/t_access, W_OK | X_OK) returns -1 -access(TEST_DIR/t_access, R_OK | W_OK | X_OK) returns -1 diff --git a/tests/xfs/018 b/tests/xfs/018 index 253af940..b2913821 100755 --- a/tests/xfs/018 +++ b/tests/xfs/018 @@ -53,9 +53,6 @@ rm -f $seqres.full $tmp.* _require_scratch _require_v2log -# link correct .out file -_link_out_file_named $seqfull.op $(_get_os_name) - echo "*** init FS" _scratch_unmount >/dev/null 2>&1 diff --git a/tests/xfs/018.cfg b/tests/xfs/018.cfg deleted file mode 100644 index 7fd51a7d..00000000 --- a/tests/xfs/018.cfg +++ /dev/null @@ -1 +0,0 @@ -linux: linux diff --git a/tests/xfs/018.op b/tests/xfs/018.op new file mode 100644 index 00000000..5fb2cc64 --- /dev/null +++ b/tests/xfs/018.op @@ -0,0 +1,4714 @@ +### xfs_logprint output ### +xfs_logprint: + data device: + log device: daddr: length: +Oper (OPNUM): tid: len: clientid: LOG flags: UNMOUNT +Unmount filesystem +Oper (OPNUM): tid: len: clientid: TRANS flags: START +Oper (OPNUM): tid: len: clientid: TRANS flags: none +TRAN: type: CREATE tid: num_items: 4 +Oper (OPNUM): tid: len: clientid: TRANS flags: none +BUF: #regs:R start blkno: () len: bmap size: 1 +Oper (OPNUM): tid: len: clientid: TRANS flags: none +AGI Buffer: XAGI +ver: 1 seq#: 0 len: cnt: 64 root: 3 +level: 1 free#: 0x3c newino: +bucket[0 - 3]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff +bucket[4 - 7]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff +bucket[8 - 11]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff +bucket[12 - 15]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff +bucket[16 - 19]: 0xffffffff +Oper (OPNUM): tid: len: clientid: TRANS flags: none +BUF: #regs:R start blkno: () len: bmap size: 2 +Oper (OPNUM): tid: len: clientid: TRANS flags: none +BUF DATA +Oper (OPNUM): tid: len: clientid: TRANS flags: none +INODE: #regs:R ino: flags: 0x1 dsize: 0 + blkno: len: boff: +Oper (OPNUM): tid: len: clientid: TRANS flags: none +INODE CORE +magic 0x494e mode 0100644 version format +nlink 1 uid 0 gid 0 +atime