Skip to content

Commit

Permalink
Adapt testsuite
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbeu
tbeu committed May 22, 2017
1 parent 7d6114c commit 925b0e6
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 219 deletions.
6 changes: 2 additions & 4 deletions test/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,8 @@ TEST_DATAFILES = $(srcdir)/datasets/matio_test_cases.m \
$(srcdir)/results/dump-large_struct_compressed_32.out \
$(srcdir)/results/dump-mat_copy-4.out \
$(srcdir)/results/dump-mat_copy-4_32.out \
$(srcdir)/results/dump-mat_copy-5.out \
$(srcdir)/results/dump-mat_copy-5_32.out \
$(srcdir)/results/dump-mat_copy-73.out \
$(srcdir)/results/dump-mat_copy-73_32.out \
$(srcdir)/results/dump-mat_copy.out \
$(srcdir)/results/dump-mat_copy_32.out \
$(srcdir)/results/dump-mat_copy-partial.out \
$(srcdir)/results/dump-var1.out \
$(srcdir)/results/dump-var1-2.out \
Expand Down
2 changes: 1 addition & 1 deletion test/mat4_readwrite.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AT_CLEANUP

AT_SETUP([Delete variables])
AT_KEYWORDS([delete])
AT_CHECK([$builddir/test_mat -v 4 copy $srcdir/datasets/matio_test_cases_v4_be.mat],[0],[],[])
AT_CHECK([$builddir/test_mat -v 4 copy $srcdir/datasets/matio_test_cases_v4_le.mat],[0],[],[])
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],[],[])
Expand Down
6 changes: 3 additions & 3 deletions test/mat5_compressed_readwrite.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ AT_KEYWORDS([copy])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-5_32.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy_32.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

Expand All @@ -38,14 +38,14 @@ AT_KEYWORDS([copy])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-5.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Delete variables])
AT_KEYWORDS([delete])
AT_SKIP_IF([test $COMPRESSION_ZLIB -ne 1])
AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_be.mat],[0],[],[])
AT_CHECK([$builddir/test_mat -v 5 -z copy $srcdir/datasets/matio_test_cases_compressed_le.mat],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var2],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var3],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var4],[0],[],[])
Expand Down
6 changes: 3 additions & 3 deletions test/mat5_uncompressed_readwrite.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ AT_SETUP([Copy variables])
AT_KEYWORDS([copy])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-5_32.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy_32.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Copy variables])
AT_KEYWORDS([copy])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-5.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Delete variables])
AT_KEYWORDS([delete])
AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_be.mat],[0],[],[])
AT_CHECK([$builddir/test_mat -v 5 copy $srcdir/datasets/matio_test_cases_uncompressed_le.mat],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var2],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var3],[0],[],[])
AT_CHECK([$builddir/test_mat delete test_mat_copy.mat var4],[0],[],[])
Expand Down
4 changes: 2 additions & 2 deletions test/mat73_compressed_readwrite.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ AT_KEYWORDS([copy])
AT_SKIP_IF([test $MAT73 -ne 1])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 7.3 -z copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-73_32.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy_32.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

Expand All @@ -38,7 +38,7 @@ AT_KEYWORDS([copy])
AT_SKIP_IF([test $MAT73 -ne 1])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 7.3 -z copy $srcdir/datasets/matio_test_cases_compressed_hdf_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-73.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

Expand Down
4 changes: 2 additions & 2 deletions test/mat73_uncompressed_readwrite.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ AT_KEYWORDS([copy])
AT_SKIP_IF([test $MAT73 -ne 1])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 4" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 7.3 copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-73_32.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy_32.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

Expand All @@ -38,7 +38,7 @@ AT_KEYWORDS([copy])
AT_SKIP_IF([test $MAT73 -ne 1])
AT_SKIP_IF([! grep -q "#define SIZEOF_VOID_P 8" $abs_top_builddir/src/matioConfig.h])
AT_CHECK([$builddir/test_mat -v 7.3 copy $srcdir/datasets/matio_test_cases_uncompressed_hdf_le.mat],[0],[],[])
AT_CHECK([cp $srcdir/results/dump-mat_copy-73.out expout
AT_CHECK([cp $srcdir/results/dump-mat_copy.out expout
$builddir/../tools/matdump -f whos -h -d test_mat_copy.mat],[0],[expout],[])
AT_CLEANUP

Expand Down
94 changes: 0 additions & 94 deletions test/results/dump-mat_copy-73.out
View file

This file was deleted.

94 changes: 0 additions & 94 deletions test/results/dump-mat_copy-73_32.out
View file

This file was deleted.

Loading

0 comments on commit 925b0e6

Please sign in to comment.