Skip to content

Commit b7faab2

Browse files
committed
Accommodate removed xsd file
1 parent 31cee49 commit b7faab2

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

dynadjust/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,10 +1510,6 @@ if (BUILD_TESTING)
15101510
add_test (NAME import-no-frame COMMAND $<TARGET_FILE:dnaimportwrapper> -n sample -r itrf1975 dsg.stn dsg.msr)
15111511
# no stations and measurements (generated above)
15121512
add_test (NAME import-no-data COMMAND $<TARGET_FILE:dnaimportwrapper> -n null ./null.stn ./null.msr)
1513-
# no DynaML.xsd - remove file in platform-independent manner (using CMake command) by setting up a test dependency
1514-
add_test (NAME import-no-xsd-file-remove COMMAND ${CMAKE_COMMAND} -E remove DynaML.xsd)
1515-
add_test (NAME import-no-xsd-file COMMAND $<TARGET_FILE:dnaimportwrapper> -n gnss gnss-networkstn.xml gnss-networkmsr.xml)
1516-
set_tests_properties(import-no-xsd-file PROPERTIES DEPENDS import-no-xsd-file-remove)
15171513
# no geoid file
15181514
add_test (NAME import-no-geoid COMMAND $<TARGET_FILE:dnaimportwrapper> -n geoid --geo-file ./nofile.geo)
15191515
# no project file
@@ -1527,7 +1523,7 @@ if (BUILD_TESTING)
15271523
add_test (NAME import-misc-network-size COMMAND $<TARGET_FILE:dnaimportwrapper> -n contig --import-contiguous-stn-msr 5000 --export-dna)
15281524

15291525
set_tests_properties(import-no-option import-invalid-option import-invalid-file import-nearby import-no-files import-no-frame
1530-
import-no-data import-no-xsd-file import-no-geoid import-no-project import-no-stns import-no-help
1526+
import-no-data import-no-geoid import-no-project import-no-stns import-no-help
15311527
import-misc-block-size import-misc-network-size import-misc-07
15321528
PROPERTIES WILL_FAIL TRUE)
15331529

@@ -1675,6 +1671,13 @@ if (BUILD_TESTING)
16751671
plot-box-ew plot-box-ns plot-no-seg plot-no-cor plot-no-apu plot-no-plate
16761672
PROPERTIES WILL_FAIL TRUE)
16771673

1674+
### IMPORT ###
1675+
# no DynaML.xsd - remove file in platform-independent manner (using CMake command) by setting up a test dependency
1676+
add_test (NAME import-no-xsd-file-remove COMMAND ${CMAKE_COMMAND} -E remove DynaML.xsd)
1677+
add_test (NAME import-no-xsd-file COMMAND $<TARGET_FILE:dnaimportwrapper> -n gnss gnss-networkstn.xml gnss-networkmsr.xml)
1678+
set_tests_properties(import-no-xsd-file PROPERTIES DEPENDS import-no-xsd-file-remove)
1679+
set_tests_properties(import-no-xsd-file PROPERTIES WILL_FAIL TRUE)
1680+
16781681
### DYNADJUST ###
16791682
# no options
16801683
add_test (NAME dyna-no-option COMMAND $<TARGET_FILE:dynadjust>)

0 commit comments

Comments
 (0)