Skip to content

Commit

Permalink
Test cosmetics
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbeu
tbeu committed Mar 20, 2016
1 parent a52d0db commit ac0565c
Show file tree
Hide file tree
Showing 31 changed files with 3,425 additions and 5,164 deletions.
61 changes: 20 additions & 41 deletions test/mat4_extended_sparse.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,100 +27,79 @@
AT_SETUP([Write 2D sparse single-precision array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c single write_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c single write_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-single.out expout
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],
[expout],[])
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse 32-bit integer array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c int32 write_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c int32 write_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-int32.out expout
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],
[expout],[])
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse 16-bit integer array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c int16 write_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c int16 write_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-int16.out expout
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],
[expout],[])
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse 16-bit unsigned integer array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c uint16 write_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c uint16 write_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-uint16.out expout
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],
[expout],[])
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse 8-bit unsigned integer array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c uint8 write_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c uint8 write_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_sparse-sparse_matrix-uint8.out expout
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],
[expout],[])
$builddir/test_mat readvar test_write_sparse.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse complex single-precision array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c single write_complex_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c single write_complex_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-single.out expout
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],
[0],[expout],[])
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse complex 32-bit integer complex array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c int32 write_complex_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c int32 write_complex_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-int32.out expout
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],
[0],[expout],[])
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse complex 16-bit integer complex array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c int16 write_complex_sparse],[0],
[],[])

AT_CHECK([$builddir/test_mat -v 4 -c int16 write_complex_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-int16.out expout
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],
[0],[expout],[])
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse complex 16-bit unsigned integer complex array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c uint16 write_complex_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c uint16 write_complex_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-uint16.out expout
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],
[0],[expout],[])
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Write 2D sparse complex 8-bit unsigned integer complex array])
AT_SKIP_IF([test $EXTENDED_SPARSE -ne 1])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 4 -c uint8 write_complex_sparse],[0],
[],[])
AT_CHECK([$builddir/test_mat -v 4 -c uint8 write_complex_sparse],[0],[],[])
AT_CHECK([cp $srcdir/results/readvar-write_complex_sparse-sparse_matrix-uint8.out expout
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],
[0],[expout],[])
$builddir/test_mat readvar test_write_sparse_complex.mat sparse_matrix],[0],[expout],[])
AT_CLEANUP
48 changes: 16 additions & 32 deletions test/mat4_read_be.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,54 +28,38 @@ AT_TESTED([test_mat])

AT_SETUP([Read 2d double-precision array])
AT_KEYWORDS([mat4_read_be])
AT_CHECK(
[cp $srcdir/results/read-var1.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var1], [0],
[expout], [])
AT_CHECK(
[cp $srcdir/results/dump-var1.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var1.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var1],[0],[expout],[])
AT_CHECK([cp $srcdir/results/dump-var1.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read 2d double-precision complex array])
AT_KEYWORDS([mat4_read_be])
AT_CHECK(
[cp $srcdir/results/read-var11.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var11], [0],
[expout], [])
AT_CHECK(
[cp $srcdir/results/dump-var11.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var11.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var11],[0],[expout],[])
AT_CHECK([cp $srcdir/results/dump-var11.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read double-precision sparse array])
AT_CHECK(
[cp $srcdir/results/read-var21.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var21], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var21.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var21],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read double-precision sparse complex array])
AT_CHECK(
[cp $srcdir/results/read-var22.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var22], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var22.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var22],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read 2D character array])
AT_KEYWORDS([mat4_read_be])
AT_CHECK(
[cp $srcdir/results/read-var24.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var24], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var24.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_be.mat var24],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read small v4 file])
AT_KEYWORDS([mat4_read_be])
AT_CHECK(
[cp $srcdir/results/read-x.out expout
$builddir/test_mat readvar $srcdir/datasets/small_v4_be.mat x], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-x.out expout
$builddir/test_mat readvar $srcdir/datasets/small_v4_be.mat x],[0],[expout],[])
AT_CLEANUP
48 changes: 16 additions & 32 deletions test/mat4_read_le.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,54 +28,38 @@ AT_TESTED([test_mat])

AT_SETUP([Read 2d double-precision array])
AT_KEYWORDS([mat4_read_le])
AT_CHECK(
[cp $srcdir/results/read-var1.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var1], [0],
[expout], [])
AT_CHECK(
[cp $srcdir/results/dump-var1.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var1.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var1],[0],[expout],[])
AT_CHECK([cp $srcdir/results/dump-var1.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read 2d double-precision complex array])
AT_KEYWORDS([mat4_read_le])
AT_CHECK(
[cp $srcdir/results/read-var11.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var11], [0],
[expout], [])
AT_CHECK(
[cp $srcdir/results/dump-var11.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var11.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var11],[0],[expout],[])
AT_CHECK([cp $srcdir/results/dump-var11.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read double-precision sparse array])
AT_CHECK(
[cp $srcdir/results/read-var21.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var21], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var21.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var21],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read double-precision sparse complex array])
AT_CHECK(
[cp $srcdir/results/read-var22.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var22], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var22.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var22],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read 2D character array])
AT_KEYWORDS([mat4_read_le])
AT_CHECK(
[cp $srcdir/results/read-var24.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var24], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-var24.out expout
$builddir/test_mat readvar $srcdir/datasets/matio_test_cases_v4_le.mat var24],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read small v4 file])
AT_KEYWORDS([mat4_read_le])
AT_CHECK(
[cp $srcdir/results/read-x.out expout
$builddir/test_mat readvar $srcdir/datasets/small_v4_le.mat x], [0],
[expout], [])
AT_CHECK([cp $srcdir/results/read-x.out expout
$builddir/test_mat readvar $srcdir/datasets/small_v4_le.mat x],[0],[expout],[])
AT_CLEANUP
24 changes: 8 additions & 16 deletions test/mat4_readslab_be.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,46 +28,38 @@ AT_TESTED([test_mat])

AT_SETUP([Read linear slab of double-precision array])
AT_KEYWORDS([mat4_readslab readslab read_data_linear])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1\(2:3:end\)], [0],
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1\(2:3:end\)],[0],
[[2 @&t@
5 @&t@
8 @&t@
11 @&t@
14 @&t@
17 @&t@
20 @&t@
]], [])
]],[])
AT_CLEANUP

AT_SETUP([Read linear slab of complex double-precision array])
AT_KEYWORDS([mat4_readslab readslab read_data_linear])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11\(2:3:end\)], [0],
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11\(2:3:end\)],[0],
[[2 + 22i @&t@
5 + 25i @&t@
8 + 28i @&t@
11 + 31i @&t@
14 + 34i @&t@
17 + 37i @&t@
20 + 40i @&t@
]], [])
]],[])
AT_CLEANUP

AT_SETUP([Read slab of double-precision array])
AT_KEYWORDS([mat4_readslab readslab])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1\(1:1:end,1:1:end\)], [0],
[[1 5 9 13 17 @&t@
2 6 10 14 18 @&t@
3 7 11 15 19 @&t@
4 8 12 16 20 @&t@
]], [])
AT_CHECK([cp $srcdir/results/dump-var1.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1\(1:1:end,1:1:end\)],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read slab of complex double-precision array])
AT_KEYWORDS([mat4_readslab readslab])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11\(1:1:end,1:1:end\)], [0],
[[1 + 21i 5 + 25i 9 + 29i 13 + 33i 17 + 37i @&t@
2 + 22i 6 + 26i 10 + 30i 14 + 34i 18 + 38i @&t@
3 + 23i 7 + 27i 11 + 31i 15 + 35i 19 + 39i @&t@
4 + 24i 8 + 28i 12 + 32i 16 + 36i 20 + 40i @&t@
]], [])
AT_CHECK([cp $srcdir/results/dump-var11.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11\(1:1:end,1:1:end\)],[0],[expout],[])
AT_CLEANUP
24 changes: 8 additions & 16 deletions test/mat4_readslab_le.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,46 +28,38 @@ AT_TESTED([test_mat])

AT_SETUP([Read linear slab of double-precision array])
AT_KEYWORDS([mat4_readslab readslab read_data_linear])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1\(2:3:end\)], [0],
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1\(2:3:end\)],[0],
[[2 @&t@
5 @&t@
8 @&t@
11 @&t@
14 @&t@
17 @&t@
20 @&t@
]], [])
]],[])
AT_CLEANUP

AT_SETUP([Read linear slab of complex double-precision array])
AT_KEYWORDS([mat4_readslab readslab read_data_linear])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11\(2:3:end\)], [0],
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11\(2:3:end\)],[0],
[[2 + 22i @&t@
5 + 25i @&t@
8 + 28i @&t@
11 + 31i @&t@
14 + 34i @&t@
17 + 37i @&t@
20 + 40i @&t@
]], [])
]],[])
AT_CLEANUP

AT_SETUP([Read slab of double-precision array])
AT_KEYWORDS([mat4_readslab readslab])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1\(1:1:end,1:1:end\)], [0],
[[1 5 9 13 17 @&t@
2 6 10 14 18 @&t@
3 7 11 15 19 @&t@
4 8 12 16 20 @&t@
]], [])
AT_CHECK([cp $srcdir/results/dump-var1.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1\(1:1:end,1:1:end\)],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read slab of complex double-precision array])
AT_KEYWORDS([mat4_readslab readslab])
AT_CHECK([$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11\(1:1:end,1:1:end\)], [0],
[[1 + 21i 5 + 25i 9 + 29i 13 + 33i 17 + 37i @&t@
2 + 22i 6 + 26i 10 + 30i 14 + 34i 18 + 38i @&t@
3 + 23i 7 + 27i 11 + 31i 15 + 35i 19 + 39i @&t@
4 + 24i 8 + 28i 12 + 32i 16 + 36i 20 + 40i @&t@
]], [])
AT_CHECK([cp $srcdir/results/dump-var11.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11\(1:1:end,1:1:end\)],[0],[expout],[])
AT_CLEANUP
6 changes: 2 additions & 4 deletions test/mat4_readwrite.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ AT_SETUP([Copy variables])
AT_KEYWORDS([copy])
AT_CHECK([$builddir/test_mat -v 4 copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-4.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],
[expout],[])
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])

This comment has been minimized.

Sign in to view

Copy link
@tbeu

tbeu Jul 12, 2016

Author Owner

@sjoelund matdump can give different output on 64-bit system compared to 32-bit system. My idea is to have each test twice with the appropriate platform-specific expected output and skip the unappropriate test (by AT_SKIP_IF). But how to find out if matdump is compiled as 32-bit or 64-bit binary? This shall work on Linux, MinGW and Cygwin. Is there a way to ask for the autotools/configure options and find out SIZEOF_VOID_P which was set platform-specific by configure? Thanks for your valuable help!
AT_CLEANUP

AT_SETUP([Delete variables])
Expand All @@ -39,8 +38,7 @@ AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var11],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var21],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var22],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-partial.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],
[expout],[])
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var1],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var24],[0],[],[])
AT_CLEANUP
Loading

0 comments on commit ac0565c

Please sign in to comment.