Skip to content

Commit

Permalink
Re #1 fixing errors caused by conflicts during cherry-picking
Browse files Browse the repository at this point in the history
abuts committed Feb 27, 2024
1 parent 6f21c9a commit a979db4
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions _test/test_sqw_file/test_hdf_pix_group.m
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
else
obj.skip_tests = false;
end
end
function close_fid(obj,fid,file_h,group_id)
H5G.close(group_id);
if ~isempty(file_h)
@@ -33,7 +34,7 @@ function close_fid(obj,fid,file_h,group_id)

function test_read_write(obj)
if obj.skip_tests
skipTest(' The test is currently disabled for high matlab versions #809' )
skipTest(' The test is currently disabled for high matlab versions #809' )
end
f_name = [tempname,'.nxsqw'];
clob2 = onCleanup(@()delete(f_name));
@@ -102,9 +103,9 @@ function test_read_write(obj)
%
function test_missing_file(obj)
if obj.skip_tests
skipTest(' The test is currently disabled for high matlab versions #809' )
skipTest(' The test is currently disabled for high matlab versions #809' )
end

f_name = [tempname,'.nxsqw'];


@@ -118,9 +119,9 @@ function test_missing_file(obj)
%
function test_multiblock_read(obj)
if obj.skip_tests
skipTest(' The test is currently disabled for high matlab versions #809' )
skipTest(' The test is currently disabled for high matlab versions #809' )
end

f_name = [tempname,'.nxsqw'];

clob2 = onCleanup(@()delete(f_name));
@@ -171,9 +172,9 @@ function test_multiblock_read(obj)
%
function test_mex_reader(obj)
if obj.skip_tests
skipTest(' The test is currently disabled for high matlab versions #809' )
skipTest(' The test is currently disabled for high matlab versions #809' )
end

if isempty(which('hdf_mex_reader'))
skipTest('The hdf mex reader was not found in the Matlab path.');
end
@@ -344,7 +345,7 @@ function test_mex_reader(obj)
%
function test_matlab_multiblock_reader(obj)
if obj.skip_tests
skipTest(' The test is currently disabled for high matlab versions #809' )
skipTest(' The test is currently disabled for high matlab versions #809' )
end

f_name = [tempname,'.nxsqw'];
@@ -513,9 +514,9 @@ function test_matlab_multiblock_reader(obj)

function test_pix_ranges(obj)
if obj.skip_tests
skipTest(' The test is currently disabled for high matlab versions #809' )
skipTest(' The test is currently disabled for high matlab versions #809' )
end

f_name = [tempname,'.nxsqw'];

clob2 = onCleanup(@()delete(f_name));

0 comments on commit a979db4

Please sign in to comment.