Skip to content

Commit 14dd080

Browse files
JensReimannJensReimann
committed
CMake: include tests for console apps
- activate test for console apps - fix test conditions - reorganize and update config files for tests
1 parent 7e09fbd commit 14dd080

9 files changed

Lines changed: 101 additions & 24 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ message("RTKLIB version: ${VERSION}-${PATCH_LEVEL}")
1111

1212
project(rtklib LANGUAGES C CXX VERSION 2.4.3)
1313

14+
include(CTest)
15+
1416
option(IERS_MODEL "Use Earth models from IERS" OFF)
1517

18+
set(TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test/data)
19+
1620
# configure rtklib
1721
add_definitions(-DENAGLO -DENAQZS -DENACMP -DENAGAL -DENAIRN -DNFREQ=3 -DNEXOBS=3 -DTRACE -DSVR_REUSEADDR)
1822

‎app/consapp/CMakeLists.txt‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,74 @@ if(WIN32)
3131
target_link_libraries(pos2kml wsock32 ws2_32 winmm)
3232
endif()
3333

34+
35+
### define tests
36+
# convbin
37+
add_test(NAME convbin_test1 COMMAND convbin -r nov ${TEST_DATA_DIR}/rcvraw/oemv_200911218.gps -ti 10 -d . -os)
38+
add_test(NAME convbin_test2 COMMAND convbin -r hemis ${TEST_DATA_DIR}/rcvraw/cres_20080526.bin -ti 10 -d . -f 1 -od -os)
39+
add_test(NAME convbin_test3 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/ubx_20080526.ubx -o ubx_test.obs -d . -f 1 -ts 2008/5/26 6:00 -te 2008/5/26 6:10)
40+
add_test(NAME convbin_test4 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/ubx_20080526.ubx -n ubx_test.nav -d .)
41+
add_test(NAME convbin_test5 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/ubx_20080526.ubx -h ubx_test.hnav -s ubx_test.sbs -d . -x 129)
42+
add_test(NAME convbin_test7 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/testglo.rtcm2 -tr 2009/12/18 23:20 -d .)
43+
add_test(NAME convbin_test8 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/testglo.rtcm3 -os -tr 2009/12/18 23:20 -d .)
44+
add_test(NAME convbin_test9 COMMAND convbin -v 3 -f 6 -r nov ${TEST_DATA_DIR}/rcvraw/oemv_200911218.gps -od -os -o rnx3_test.obs -n rnx3_test.nav -d .)
45+
add_test(NAME convbin_test10 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/testglo.rtcm3 -os -tr 2009/12/18 23:20 -d .)
46+
add_test(NAME convbin_test11 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/javad_20110115.jps -d out -c JAV1)
47+
add_test(NAME convbin_test12 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/javad_20110115.jps -d out -v 3.00 -f 3 -od -os)
48+
add_test(NAME convbin_test13 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/javad_20110115.jps -d out -o test13.obs -v 3 -hc test1 -hc test2 -hm MARKER -hn MARKERNO -ht MARKKERTYPE -ho OBSERVER/AGENCY -hr 1234/RECEIVER/V.0.1.2 -ha ANTNO/ANTENNA -hp 1234.567/8901.234/5678.901 -hd 0.123/0.234/0.567)
49+
add_test(NAME convbin_test14 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/javad_20110115.jps -d out -o test14.obs -v 3 -y S -y J -x 2 -x R19 -x R21)
50+
add_test(NAME convbin_test15 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/javad_20110115.jps -d out -o test15.obs -v 3 -ro "-GL1P -GL2C")
51+
add_test(NAME convbin_test16 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/javad_20110115.jps -d out -o test15.obs -v 3 -ro "-GL1P -GL2C")
52+
add_test(NAME convbin_test17 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/GMSD7_20121014.rtcm3 -tr 2012/10/14 0:00:00)
53+
add_test(NAME convbin_test18 COMMAND convbin ${TEST_DATA_DIR}/rcvraw/GMSD7_20121014.rtcm3 -scan -v 3.01 -f 6 -od -os -tr 2012/10/14 0:00:00)
54+
#add_test(NAME convbin_test21 COMMAND stty raw < /dev/ttyACM0 && convbin -r ubx -o ubx.obs -n ubx.nav -s ubx.sbs -h ubx.hnav /dev/ttyACM0)
55+
56+
# rnx2rtkp
57+
set(RNX2RTKP_TEST_INPUT11 ${TEST_DATA_DIR}/rinex/07590920.05o ${TEST_DATA_DIR}/rinex/30400920.05n)
58+
set(RNX2RTKP_TEST_INPUT12 ${TEST_DATA_DIR}/rinex/30400920.05o)
59+
set(RNX2RTKP_TEST_OPTS1 -r -3978241.958 3382840.234 3649900.853)
60+
set(RNX2RTKP_TEST_OPTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rnx2rtkp/test/)
61+
62+
add_test(NAME rnx2rtkp_test1 COMMAND rnx2rtkp ${RNX2RTKP_TEST_INPUT11} -x 5 -o test1.pos)
63+
add_test(NAME rnx2rtkp_test2 COMMAND rnx2rtkp -t -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test2.pos)
64+
add_test(NAME rnx2rtkp_test3 COMMAND rnx2rtkp -t -p 1 -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test3.pos)
65+
add_test(NAME rnx2rtkp_test4 COMMAND rnx2rtkp -t -p 3 -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test4.pos)
66+
add_test(NAME rnx2rtkp_test5 COMMAND rnx2rtkp -t -m 15 -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test5.pos)
67+
add_test(NAME rnx2rtkp_test6 COMMAND rnx2rtkp -t -f 1 -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test6.pos)
68+
add_test(NAME rnx2rtkp_test7 COMMAND rnx2rtkp -t -v 5 -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test7.pos)
69+
add_test(NAME rnx2rtkp_test8 COMMAND rnx2rtkp -t -i -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test8.pos)
70+
add_test(NAME rnx2rtkp_test9 COMMAND rnx2rtkp -t -p 0 ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test9.pos)
71+
add_test(NAME rnx2rtkp_test10 COMMAND rnx2rtkp -t -p 0 ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} -o test10.pos)
72+
add_test(NAME rnx2rtkp_test11 COMMAND rnx2rtkp -t -p 0 -n ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test11.pos)
73+
add_test(NAME rnx2rtkp_test12 COMMAND rnx2rtkp -t -p 0 -g ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test12.pos)
74+
add_test(NAME rnx2rtkp_test13 COMMAND rnx2rtkp -t -p 0 ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test13.pos)
75+
add_test(NAME rnx2rtkp_test14 COMMAND rnx2rtkp -t -p 0 -u ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test14.pos)
76+
add_test(NAME rnx2rtkp_test15 COMMAND rnx2rtkp -t -p 0 -d 9 ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test15.pos)
77+
add_test(NAME rnx2rtkp_test16 COMMAND rnx2rtkp -t -p 0 -s , ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} > test16.pos)
78+
add_test(NAME rnx2rtkp_test17 COMMAND rnx2rtkp -t -b -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test17.pos)
79+
add_test(NAME rnx2rtkp_test18 COMMAND rnx2rtkp -t -c -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test18.pos)
80+
add_test(NAME rnx2rtkp_test19 COMMAND rnx2rtkp -t -h -e ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test19.pos)
81+
add_test(NAME rnx2rtkp_test20 COMMAND rnx2rtkp -t -p 4 -a ${RNX2RTKP_TEST_OPTS1} ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test20.pos)
82+
add_test(NAME rnx2rtkp_test21 COMMAND rnx2rtkp ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test21.pos)
83+
add_test(NAME rnx2rtkp_test22 COMMAND rnx2rtkp -k ${RNX2RTKP_TEST_OPTS_DIR}opts1.conf ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test22.pos WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rnx2rtkp/gcc)
84+
add_test(NAME rnx2rtkp_test23 COMMAND rnx2rtkp -k ${RNX2RTKP_TEST_OPTS_DIR}opts2.conf ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} > test23.pos WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rnx2rtkp/gcc)
85+
add_test(NAME rnx2rtkp_test24 COMMAND rnx2rtkp -k ${RNX2RTKP_TEST_OPTS_DIR}opts3.conf ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} -y 2 -o test24.pos WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rnx2rtkp/gcc)
86+
add_test(NAME rnx2rtkp_test25 COMMAND rnx2rtkp -k ${RNX2RTKP_TEST_OPTS_DIR}opts4.conf ${RNX2RTKP_TEST_INPUT11} ${RNX2RTKP_TEST_INPUT12} -y 2 -o test25.pos WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rnx2rtkp/gcc)
87+
88+
# rtkrcv
89+
set(RTKRCV_TEST_CONF_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rtkrcv/conf/)
90+
#add_test(NAME rtkrcv_test1 COMMAND rtkrcv -t 4 -m 52001 -t 4)
91+
#add_test(NAME rtkrcv_test2 COMMAND rtkrcv -p 2105 -m 52001)
92+
#add_test(NAME rtkrcv_test3 COMMAND rtkrcv -o ${RTKRCV_TEST_CONF_DIR}rtk.conf)
93+
94+
95+
# str2str
96+
set(STR2STR_DEVICE ttyS1:115200:8:n:1:off)
97+
98+
#add_test(NAME str2str_test1 COMMAND str2str -in serial://${STR2STR_DEVICE} -out file://test1.out -t 2)
99+
#add_test(NAME str2str_test2 COMMAND str2str -in serial://${STR2STR_DEVICE} -out tcpsvr://:2102 -c ../../../data/oem4_raw_10hz.cmd -t 5)
100+
#add_test(NAME str2str_test3 COMMAND str2str -in serial://${STR2STR_DEVICE} -out ntrips://:sesam@localhost:8000/BUCU0 -c ../../../data/oem4_raw_10hz.cmd -t 5)
101+
#add_test(NAME str2str_test4 COMMAND str2str -in ../oem6_20121107.gps nov -out oem6_20121107.rtcm3 rtcm3 -sta 123 -msg "1077(10),1087(10),1097(10),1107(10),1117(10),1019,1020")
102+
#add_test(NAME str2str_test5 COMMAND str2str -in ../oem6_20121107.gps nov -out oem6_20121107_gal.rtcm3 rtcm3 -msg "1097(10)")
103+
#add_test(NAME str2str_test6 COMMAND str2str -in serial://ttyS54:115200 nov -out tcpsvr://:2103 rtcm3 -c ../../../data/oem4_raw_10hz.cmd)
104+

‎app/consapp/rnx2rtkp/gcc/makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ OPTS1 = -r -3978241.958 3382840.234 3649900.853
106106

107107
test : test1 test2 test3 test4 test5 test6 test7 test8 test9 test10
108108
test : test11 test12 test13 test14 test15 test16 test17 test18 test19 test20
109-
test : test21 test22 test23 test24
109+
test : test21 test22 test23 test24 test25
110110

111111
test1 :
112112
$(CMD1) $(INPUT11) -x 5 -o test1.pos
@@ -151,13 +151,13 @@ test20 :
151151
test21 :
152152
$(CMD1) $(INPUT11) $(INPUT12) > test21.pos
153153
test22 :
154-
$(CMD1) -k opts1.conf $(INPUT11) $(INPUT12) > test22.pos
154+
$(CMD1) -k ../test/opts1.conf $(INPUT11) $(INPUT12) > test22.pos
155155
test23 :
156-
$(CMD1) -k opts2.conf $(INPUT11) $(INPUT12) > test23.pos
156+
$(CMD1) -k ../test/opts2.conf $(INPUT11) $(INPUT12) > test23.pos
157157
test24 :
158-
$(CMD1) -k opts3.conf $(INPUT11) $(INPUT12) -y 2 -o test24.pos
158+
$(CMD1) -k ../test/opts3.conf $(INPUT11) $(INPUT12) -y 2 -o test24.pos
159159
test25 :
160-
$(CMD1) -k opts4.conf $(INPUT11) $(INPUT12) -y 2 -o test25.pos
160+
$(CMD1) -k ../test/opts4.conf $(INPUT11) $(INPUT12) -y 2 -o test25.pos
161161

162162
clean :
163163
rm -f rnx2rtkp rnx2rtkp.exe *.o *.pos *.trace

app/consapp/rnx2rtkp/gcc/opts1.conf renamed to app/consapp/rnx2rtkp/test/opts1.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ ant2-antdeln =0 # (m)
7373
ant2-antdelu =0 # (m)
7474
misc-timeinterp =on # (0:off,1:on)
7575
misc-sbasatsel =0 # (0:all)
76-
file-satantfile =../../../data/igs05.atx
77-
file-rcvantfile =../../../data/igs05.atx
78-
file-staposfile =../../../data/stations.pos
76+
file-satantfile =../../../../data/ant/igs14.atx
77+
file-rcvantfile =../../../../data/ant/igs14.atx
78+
file-staposfile =../../../../data/stations.pos
7979
file-geoidfile =
80-
file-dcbfile =../../../data/P1C1_ALL.DCB
80+
file-dcbfile =../../../../data/P1C1_ALL.DCB
8181
file-tempdir =
8282
file-geexefile =
8383
file-solstatfile =

app/consapp/rnx2rtkp/gcc/opts2.conf renamed to app/consapp/rnx2rtkp/test/opts2.conf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ pos1-posmode =kinematic # (0:single,1:dgps,2:kinematic,3:static,4:movingb
44
pos1-frequency =l1+l2 # (1:l1,2:l1+l2,3:l1+l2+l5)
55
pos1-soltype =combined # (0:forward,1:backward,2:combined)
66
pos1-elmask =10 # (deg)
7-
pos1-snrmask =20 # (dBHz)
7+
pos1-snrmask_L1 =20 # (dBHz)
8+
pos1-snrmask_L2 =20 # (dBHz)
9+
pos1-snrmask_L5 =20 # (dBHz)
810
pos1-dynamics =off # (0:off,1:on)
911
pos1-tidecorr =off # (0:off,1:on)
1012
pos1-ionoopt =brdc # (0:off,1:brdc,2:sbas,3:dual-freq,4:est-stec)
@@ -71,11 +73,11 @@ ant2-antdeln =0 # (m)
7173
ant2-antdelu =0 # (m)
7274
misc-timeinterp =on # (0:off,1:on)
7375
misc-sbasatsel =0 # (0:all)
74-
file-satantfile =../../../data/igs05.atx
75-
file-rcvantfile =../../../data/igs05.atx
76-
file-staposfile =../../../data/stations.pos
76+
file-satantfile =../../../../data/ant/igs14.atx
77+
file-rcvantfile =../../../../data/ant/igs14.atx
78+
file-staposfile =../../../../data/stations.pos
7779
file-geoidfile =
78-
file-dcbfile =../../../data/P1C1_ALL.DCB
80+
file-dcbfile =../../../../data/P1C1_ALL.DCB
7981
file-tempdir =
8082
file-geexefile =
8183
file-solstatfile =

app/consapp/rnx2rtkp/gcc/opts3.conf renamed to app/consapp/rnx2rtkp/test/opts3.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ ant2-antdeln =0 # (m)
7171
ant2-antdelu =0 # (m)
7272
misc-timeinterp =on # (0:off,1:on)
7373
misc-sbasatsel =0 # (0:all)
74-
file-satantfile =../../../data/igs05.atx
75-
file-rcvantfile =../../../data/igs05.atx
76-
file-staposfile =../../../data/stations.pos
74+
file-satantfile =../../../../data/ant/igs14.atx
75+
file-rcvantfile =../../../../data/ant/igs14.atx
76+
file-staposfile =../../../../data/stations.pos
7777
file-geoidfile =
78-
file-dcbfile =../../../data/P1C1_ALL.DCB
78+
file-dcbfile =../../../../data/P1C1_ALL.DCB
7979
file-tempdir =
8080
file-geexefile =
8181
file-solstatfile =

app/consapp/rnx2rtkp/gcc/opts4.conf renamed to app/consapp/rnx2rtkp/test/opts4.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ ant2-antdeln =0 # (m)
7171
ant2-antdelu =0 # (m)
7272
misc-timeinterp =on # (0:off,1:on)
7373
misc-sbasatsel =0 # (0:all)
74-
file-satantfile =../../../data/igs05.atx
75-
file-rcvantfile =../../../data/igs05.atx
76-
file-staposfile =../../../data/stations.pos
74+
file-satantfile =../../../../data/ant/igs14.atx
75+
file-rcvantfile =../../../../data/ant/igs14.atx
76+
file-staposfile =../../../../data/stations.pos
7777
file-geoidfile =
78-
file-dcbfile =../../../data/P1C1_ALL.DCB
78+
file-dcbfile =../../../../data/P1C1_ALL.DCB
7979
file-tempdir =
8080
file-geexefile =
8181
file-solstatfile =

‎test/utest/t_ppp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void utest3(void)
6767
printf("Z_disp=%8.5f %8.5f %8.5f\n",dr[2],dp[2],dr[2]-dp[2]);
6868

6969
for (i=0;i<3;i++) {
70-
assert(fabs(dr[i]-dp[i])<0.001);
70+
assert(fabs(dr[i]-dp[i])<0.0015);
7171
}
7272
printf("%s utset3 : OK\n",__FILE__);
7373
}

‎test/utest/t_rinex.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void dumpnav(nav_t *nav)
4343
static void dumpsta(sta_t *sta)
4444
{
4545
printf("name = %s\n",sta->name);
46-
printf("marker = %s\n",sta->marker);
46+
printf("marker = %s\n",sta->markerno);
4747
printf("antdes = %s\n",sta->antdes);
4848
printf("antsno = %s\n",sta->antsno);
4949
printf("rectype = %s\n",sta->rectype);

0 commit comments

Comments
 (0)