Skip to content

Commit

Permalink
Merge branch 'papadop-NewTestsReorg'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbeu
tbeu committed Apr 1, 2016
2 parents ac0565c + ba9c42c commit bb10d73
Show file tree
Hide file tree
Showing 109 changed files with 4,333 additions and 30,123 deletions.
2 changes: 1 addition & 1 deletion src/mat5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ GetStructFieldBufSize(matvar_t *matvar)
int nmemb = 1, i;

if ( matvar == NULL )
return nBytes;
return GetEmptyMatrixMaxBufSize(NULL, 2);

/* Add the Array Flags tag and space to the number of bytes */
nBytes += tag_size + array_flags_size;
Expand Down
85 changes: 85 additions & 0 deletions test/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,23 @@ TEST_DATAFILES = $(srcdir)/datasets/matio_test_cases.m \
$(srcdir)/datasets/small_v4_be.mat \
$(srcdir)/datasets/small_v4_le.mat \
$(srcdir)/datasets/large_struct_compressed_le.mat \
$(srcdir)/matlab/test_write_2d_logical.m \
$(srcdir)/matlab/test_write_2d_numeric.m \
$(srcdir)/matlab/test_write_cell_2d_logical.m \
$(srcdir)/matlab/test_write_cell_2d_numeric.m \
$(srcdir)/matlab/test_write_cell_complex_2d_numeric.m \
$(srcdir)/matlab/test_write_cell_empty_struct.m \
$(srcdir)/matlab/test_write_char.m \
$(srcdir)/matlab/test_write_complex_2d_numeric.m \
$(srcdir)/matlab/test_write_empty.m \
$(srcdir)/matlab/test_write_empty_cell.m \
$(srcdir)/matlab/test_write_empty_struct.m \
$(srcdir)/matlab/test_write_sparse.m \
$(srcdir)/matlab/test_write_sparse_complex.m \
$(srcdir)/matlab/test_write_struct_2d_logical.m \
$(srcdir)/matlab/test_write_struct_2d_numeric.m \
$(srcdir)/matlab/test_write_struct_char.m \
$(srcdir)/matlab/test_write_struct_complex_2d_numeric.m \
$(srcdir)/results/cell_api_getcells.out \
$(srcdir)/results/cell_api_getlinear.out \
$(srcdir)/results/cell_api_set.out \
Expand All @@ -85,7 +102,72 @@ TEST_DATAFILES = $(srcdir)/datasets/matio_test_cases.m \
$(srcdir)/results/dump-mat_copy-73.out \
$(srcdir)/results/dump-mat_copy-partial.out \
$(srcdir)/results/dump-var1.out \
$(srcdir)/results/dump-var1-2.out \
$(srcdir)/results/dump-var2x-field2-1.out \
$(srcdir)/results/dump-var2x-field2-2.out \
$(srcdir)/results/dump-var2x-field2-3.out \
$(srcdir)/results/dump-var3x-field2-1.out \
$(srcdir)/results/dump-var3x-field2-2.out \
$(srcdir)/results/dump-var3x-field2-3.out \
$(srcdir)/results/dump-var7x-3.out \
$(srcdir)/results/dump-var7x-4.out \
$(srcdir)/results/dump-var8x-3.out \
$(srcdir)/results/dump-var8x-4.out \
$(srcdir)/results/dump-var11.out \
$(srcdir)/results/dump-var11-2.out \
$(srcdir)/results/dump-var70-1.out \
$(srcdir)/results/dump-var70-2.out \
$(srcdir)/results/dump-var71-1.out \
$(srcdir)/results/dump-var71-2.out \
$(srcdir)/results/dump-var72-1.out \
$(srcdir)/results/dump-var72-2.out \
$(srcdir)/results/dump-var73-1.out \
$(srcdir)/results/dump-var73-2.out \
$(srcdir)/results/dump-var74-1.out \
$(srcdir)/results/dump-var74-2.out \
$(srcdir)/results/dump-var75-1.out \
$(srcdir)/results/dump-var75-2.out \
$(srcdir)/results/dump-var76-1.out \
$(srcdir)/results/dump-var76-2.out \
$(srcdir)/results/dump-var77-1.out \
$(srcdir)/results/dump-var77-2.out \
$(srcdir)/results/dump-var78-1.out \
$(srcdir)/results/dump-var78-2.out \
$(srcdir)/results/dump-var78-3.out \
$(srcdir)/results/dump-var78-4.out \
$(srcdir)/results/dump-var79-1.out \
$(srcdir)/results/dump-var79-2.out \
$(srcdir)/results/dump-var79-3.out \
$(srcdir)/results/dump-var79-4.out \
$(srcdir)/results/dump-var80-1.out \
$(srcdir)/results/dump-var80-2.out \
$(srcdir)/results/dump-var81-1.out \
$(srcdir)/results/dump-var81-2.out \
$(srcdir)/results/dump-var82-1.out \
$(srcdir)/results/dump-var82-2.out \
$(srcdir)/results/dump-var83-1.out \
$(srcdir)/results/dump-var83-2.out \
$(srcdir)/results/dump-var84-1.out \
$(srcdir)/results/dump-var84-2.out \
$(srcdir)/results/dump-var85-1.out \
$(srcdir)/results/dump-var85-2.out \
$(srcdir)/results/dump-var86-1.out \
$(srcdir)/results/dump-var86-2.out \
$(srcdir)/results/dump-var86-3.out \
$(srcdir)/results/dump-var86-4.out \
$(srcdir)/results/dump-var87-1.out \
$(srcdir)/results/dump-var87-2.out \
$(srcdir)/results/dump-var87-3.out \
$(srcdir)/results/dump-var87-4.out \
$(srcdir)/results/dump-var88-1.out \
$(srcdir)/results/dump-var88-2.out \
$(srcdir)/results/dump-var88-3.out \
$(srcdir)/results/dump-var88-4.out \
$(srcdir)/results/dump-var89-1.out \
$(srcdir)/results/dump-var89-2.out \
$(srcdir)/results/dump-var89-3.out \
$(srcdir)/results/dump-var89-4.out \
$(srcdir)/results/getstructfield-large_struct_compressed.out \
$(srcdir)/results/ind2sub.out \
$(srcdir)/results/read-var1.out \
$(srcdir)/results/read-var2.out \
Expand Down Expand Up @@ -114,6 +196,7 @@ TEST_DATAFILES = $(srcdir)/datasets/matio_test_cases.m \
$(srcdir)/results/read-var25.out \
$(srcdir)/results/read-var26.out \
$(srcdir)/results/read-var27.out \
$(srcdir)/results/read-var27-73.out \
$(srcdir)/results/read-var28.out \
$(srcdir)/results/read-var29.out \
$(srcdir)/results/read-var30.out \
Expand Down Expand Up @@ -153,13 +236,15 @@ TEST_DATAFILES = $(srcdir)/datasets/matio_test_cases.m \
$(srcdir)/results/read-var64.out \
$(srcdir)/results/read-var65.out \
$(srcdir)/results/read-var66.out \
$(srcdir)/results/read-var66-73.out \
$(srcdir)/results/read-var67.out \
$(srcdir)/results/read-var68.out \
$(srcdir)/results/read-var69.out \
$(srcdir)/results/read-var90.out \
$(srcdir)/results/read-var91.out \
$(srcdir)/results/read-var92.out \
$(srcdir)/results/read-x.out \
$(srcdir)/results/readvar-write_cell_empty_struct-var1.out \
$(srcdir)/results/readvar-write_char-a.out \
$(srcdir)/results/readvar-write_complex_sparse-sparse_matrix-double.out \
$(srcdir)/results/readvar-write_complex_sparse-sparse_matrix-int8.out \
Expand Down
22 changes: 4 additions & 18 deletions test/mat4_readslab_be.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,14 @@ 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],
[[2 @&t@
5 @&t@
8 @&t@
11 @&t@
14 @&t@
17 @&t@
20 @&t@
]],[])
AT_CHECK([cp $srcdir/results/dump-var1-2.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var1\(2:3:end\)],[0],[expout],[])
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],
[[2 + 22i @&t@
5 + 25i @&t@
8 + 28i @&t@
11 + 31i @&t@
14 + 34i @&t@
17 + 37i @&t@
20 + 40i @&t@
]],[])
AT_CHECK([cp $srcdir/results/dump-var11-2.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_be.mat var11\(2:3:end\)],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read slab of double-precision array])
Expand Down
22 changes: 4 additions & 18 deletions test/mat4_readslab_le.at
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,14 @@ 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],
[[2 @&t@
5 @&t@
8 @&t@
11 @&t@
14 @&t@
17 @&t@
20 @&t@
]],[])
AT_CHECK([cp $srcdir/results/dump-var1-2.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var1\(2:3:end\)],[0],[expout],[])
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],
[[2 + 22i @&t@
5 + 25i @&t@
8 + 28i @&t@
11 + 31i @&t@
14 + 34i @&t@
17 + 37i @&t@
20 + 40i @&t@
]],[])
AT_CHECK([cp $srcdir/results/dump-var11-2.out expout
$builddir/../tools/matdump -d $srcdir/datasets/matio_test_cases_v4_le.mat var11\(2:3:end\)],[0],[expout],[])
AT_CLEANUP

AT_SETUP([Read slab of double-precision array])
Expand Down
Loading

0 comments on commit bb10d73

Please sign in to comment.