Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unix paths from long options tests. This was breaking on Windows. #8405

Merged
merged 1 commit into from
Mar 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/longopt/grdedit_inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
"b,c,n,p", "both,current,none,previous",
"", "",
GMT_TP_STANDARD },
{ 0, 'D', "header|metadata",
{ 0, 'D', "meta|metadata",
"", "",
"c,d,n,o,r,s,t,v,x,y,z",
"cpt,dname,invalid,offset,remark,scale,title,varname,xname,yname,zname",
"cpt,dname,invalid,offset,remark,scale,title,varname,xname,yname,zname",
GMT_TP_STANDARD },
{ 0, 'E', "transform",
"a,e,h,l,r,t,v", "hvflip,xyswap,hflip,rot90ccw,rot90cw,transpose,vflip",
Expand All @@ -46,7 +46,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
GMT_TP_STANDARD },
{ 0, 'N', "nodes|replace", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'S', "lonshift_region", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'T', "toggle_registration|toggle", "", "", "", "", GMT_TP_STANDARD },
{ 0, 'T', "toggle|toggle_registration", "", "", "", "", GMT_TP_STANDARD },
{ 0, '\0', "", "", "", "", "", 0 } /* End of list marked with empty option and strings */
};
#endif /* !GRDEDIT_INC_H */
2 changes: 1 addition & 1 deletion src/longopt/greenspline_inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
"n,r,v", "largest,ratio,variance",
"c,f,i,n", "cumulative,file,incremental,no_surface",
GMT_TP_STANDARD },
{ 0, 'D', "metadata|mode",
{ 0, 'D', "meta|metadata",
"", "",
"c,d,n,o,r,s,t,v,x,y,z",
"cpt|cmap,dname,invalid,offset,remark,scale,title,varname,xname,yname,zname",
Expand Down
4 changes: 2 additions & 2 deletions test/batch/batch-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cat << EOF > $a
--l2stranstest -Qs
--l2stranstest -Sbpre.sh -Sfpost.sh
--l2stranstest -T6 -T50/100/5+n
--l2stranstest -T/some/timefile+p7+s12
--l2stranstest -Ttimefile+p7+s12
--l2stranstest -T9+w -T"6+wmy string" -T2+W
--l2stranstest -W
--l2stranstest -Z
Expand All @@ -26,7 +26,7 @@ gmt $m $l2s --include --onemaster --prefix >> $b
gmt $m $l2s --debug=noexec >> $b
gmt $m $l2s --optscript=preflight:pre.sh --optscript=postflight:post.sh >> $b
gmt $m $l2s --njobs=6 --minmax=50/100/5+njobs >> $b
gmt $m $l2s --timefile=/some/timefile+tagwidth:7+multisys:12 >> $b
gmt $m $l2s --timefile=timefile+tagwidth:7+multisys:12 >> $b
gmt $m $l2s --njobs=9+words --njobs=6+words:'my string' --njobs=2+tabwords >> $b
gmt $m $l2s --tmpdir >> $b
gmt $m $l2s --erasescripts >> $b
Expand Down
4 changes: 2 additions & 2 deletions test/blockmean/blockmean-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cat << EOF > $a
--l2stranstest -Ahs
--l2stranstest -C
--l2stranstest -E+p -E+P
--l2stranstest -G/some/file.grd
--l2stranstest -Gfile.grd
--l2stranstest -Sm -Sn -Ss -Sw
--l2stranstest -Wi -Wo+s
EOF
Expand All @@ -23,7 +23,7 @@ gmt $m $l2s --fields=mean,stddev,low,high,weight >> $b
gmt $m $l2s --fields=high,stddev >> $b
gmt $m $l2s --center >> $b
gmt $m $l2s --extend+weighted --extend+simple >> $b
gmt $m $l2s --outgrid=/some/file.grd >> $b
gmt $m $l2s --outgrid=file.grd >> $b
gmt $m $l2s --statistic=mean --statistic=count --statistic=sum --statistic=weight >> $b
gmt $m $l2s --weights=in --weights=out+sigma >> $b

Expand Down
4 changes: 2 additions & 2 deletions test/blockmedian/blockmedian-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cat << EOF > $a
--l2stranstest -C
--l2stranstest -E -Eb
--l2stranstest -Er+l -Es+h
--l2stranstest -G/some/file.grd
--l2stranstest -Gfile.grd
--l2stranstest -Q
--l2stranstest -T0.8
--l2stranstest -Wi -Wo+s
Expand All @@ -24,7 +24,7 @@ gmt $m $l2s --fields=zslq25q75hw >> $b
gmt $m $l2s --center >> $b
gmt $m $l2s --extend --extend=boxwhisker >> $b
gmt $m $l2s --extend=record+lower --extend=source+higher >> $b
gmt $m $l2s --outgrid=/some/file.grd >> $b
gmt $m $l2s --outgrid=file.grd >> $b
gmt $m $l2s --quick >> $b
gmt $m $l2s --quantile=0.8 >> $b
gmt $m $l2s --weights=in --weights=out+sigma >> $b
Expand Down
4 changes: 2 additions & 2 deletions test/blockmode/blockmode-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cat << EOF > $a
--l2stranstest -C
--l2stranstest -D+a -D40+c -D+h -D+l
--l2stranstest -E -Er+l -Es+h
--l2stranstest -G/some/file.grd
--l2stranstest -Gfile.grd
--l2stranstest -Q
--l2stranstest -Wi -Wo+s
EOF
Expand All @@ -25,7 +25,7 @@ gmt $m $l2s --fields=l1_scale,high,weight >> $b
gmt $m $l2s --center >> $b
gmt $m $l2s --histogram+average --histogram=40+center --histogram+high --histogram+low >> $b
gmt $m $l2s --extend --extend=record+lower --extend=source+higher >> $b
gmt $m $l2s --outgrid=/some/file.grd >> $b
gmt $m $l2s --outgrid=file.grd >> $b
gmt $m $l2s --quick >> $b
gmt $m $l2s --weights=in --weights=out+sigma >> $b

Expand Down
4 changes: 2 additions & 2 deletions test/filter1d/filter1d-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cat << EOF > $a
--l2stranstest -Fu100 -FU100
--l2stranstest -L15 -N3 -N5
--l2stranstest -Q0.4 -S0.99
--l2stranstest -T10/100/5+a -T/some/file
--l2stranstest -T10/100/5+a -Tfile
--l2stranstest -T5+e -T5+i -T5+n
EOF

Expand All @@ -38,7 +38,7 @@ gmt $m $l2s --filter=minall:100 --filter=minpos:100 >> $b
gmt $m $l2s --filter=maxall:100 --filter=maxneg:100 >> $b
gmt $m $l2s --gap_width=15 --time_col=3 --time_column=5 >> $b
gmt $m $l2s --quality=0.4 --symmetry=0.99 >> $b
gmt $m $l2s --range=10/100/5+array --range=/some/file >> $b
gmt $m $l2s --range=10/100/5+array --range=file >> $b
gmt $m $l2s --series=5+exact --series=5+inverse --series=5+number >> $b

diff $a $b --strip-trailing-cr > fail
12 changes: 6 additions & 6 deletions test/gmt2kml/gmt2kml-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ rm -f $a $b ; touch $b
cat << EOF > $a
--l2stranstest -Aa25 -Ag
--l2stranstest -Asx1.5
--l2stranstest -C/some/file.cpt -C/some/file.cpt
--l2stranstest -D/some/file.dscpt
--l2stranstest -Cfile.cpt -Cfile.cpt
--l2stranstest -Dfile.dscpt
--l2stranstest -E+e+s
--l2stranstest -Fe -Fs -Ft
--l2stranstest -Fl -Fp -Fw
Expand All @@ -25,7 +25,7 @@ cat << EOF > $a
--l2stranstest -O
--l2stranstest -Qa23 -Qi10 -Qs0.5
--l2stranstest -Sc2 -Sn3
--l2stranstest -TmyTitle/some/folder
--l2stranstest -TmyTitlefolder
--l2stranstest -W2 -W+c -W+cl -W+cf
--l2stranstest -Z+a10/20 -Z+f3/5
--l2stranstest -Z+l2/3 -Z+o+v
Expand All @@ -34,8 +34,8 @@ EOF
# module-specific longopts
gmt $m $l2s --altitude_mode=absolute:25 --altitude_mode=relative_surface >> $b
gmt $m $l2s --altitude_mode=relative_floor:x1.5 >> $b
gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b
gmt $m $l2s --description=/some/file.dscpt >> $b
gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b
gmt $m $l2s --description=file.dscpt >> $b
gmt $m $l2s --line_render+extrude+connect >> $b
gmt $m $l2s --feature=event --feature_type=symbol --feature=timespan >> $b
gmt $m $l2s --feature=line --feature=polygon --feature=wiggle >> $b
Expand All @@ -48,7 +48,7 @@ gmt $m $l2s --name=text --feature_name=5 --name="Some %d format string" >> $b
gmt $m $l2s --overlay >> $b
gmt $m $l2s --wiggle=azimuth:23 --wiggle=fixed:10 --wiggle=scale:0.5 >> $b
gmt $m $l2s --scale=icon:2 --scale=label:3 >> $b
gmt $m $l2s --title=myTitle/some/folder >> $b
gmt $m $l2s --title=myTitlefolder >> $b
gmt $m $l2s --pen=2 --pen+color --pen+color:l --pen+color:f >> $b
gmt $m $l2s --attributes+altitude:10/20 --attrib+fade:3/5 >> $b
gmt $m $l2s --attrib+detail:2/3 --attrib+open+invisible >> $b
Expand Down
12 changes: 6 additions & 6 deletions test/gmtconvert/gmtconvert-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ cat << EOF > $a
--l2stranstest -Irs
--l2stranstest -L -L
--l2stranstest -N2+a -N1+d
--l2stranstest -Q2,3:1:6 -Q+f/some/file
--l2stranstest -Q2,3:1:6 -Q+ffile
--l2stranstest -Q~3,4:2:12
--l2stranstest -S"some string+f/this/file+e"
--l2stranstest -S"~some other string+f/your/file"
--l2stranstest -S"some string+fthis/file+e"
--l2stranstest -S"~some other string+fyour/file"
--l2stranstest -Thd~3,4:2:12 -Th
--l2stranstest -W+n
--l2stranstest -Z
Expand All @@ -39,10 +39,10 @@ gmt $m $l2s --invert=tables,segments,records >> $b
gmt $m $l2s --reverse=records,segments >> $b
gmt $m $l2s --segment_headers --list_only >> $b
gmt $m $l2s --sort=2+ascend --sort=1+descend >> $b
gmt $m $l2s --segments=2,3:1:6 --segments+file:/some/file >> $b
gmt $m $l2s --segments=2,3:1:6 --segments+file:file >> $b
gmt $m $l2s --segments=~3,4:2:12 >> $b
gmt $m $l2s --select_header='some string'+file:/this/file+exact >> $b
gmt $m $l2s --select_hdr=~'some other string'+file:/your/file >> $b
gmt $m $l2s --select_header='some string'+file:this/file+exact >> $b
gmt $m $l2s --select_hdr=~'some other string'+file:your/file >> $b
gmt $m $l2s --suppress=headers,duplicates:~3,4:2:12 --skip=headers >> $b
gmt $m $l2s --word2num+nonans >> $b
gmt $m $l2s --transpose >> $b
Expand Down
4 changes: 2 additions & 2 deletions test/gmtget/gmtget-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b

cat << EOF > $a
--l2stranstest -Ddata=earth -Dcache
--l2stranstest -G/some/gmt.conf
--l2stranstest -Gsome/gmt.conf
--l2stranstest -I1m
--l2stranstest -L
--l2stranstest -N
Expand All @@ -19,7 +19,7 @@ EOF

# module-specific longopts
gmt $m $l2s --data=data=earth --dataset=cache >> $b
gmt $m $l2s --gmtconf=/some/gmt.conf >> $b
gmt $m $l2s --gmtconf=some/gmt.conf >> $b
gmt $m $l2s --increment=1m >> $b
gmt $m $l2s --lines >> $b
gmt $m $l2s --no_convert >> $b
Expand Down
12 changes: 6 additions & 6 deletions test/gmtmath/gmtmath-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ b=$m-l2s-b.txt
rm -f $a $b ; touch $b

cat << EOF > $a
--l2stranstest -A/some/file+e -A/some/file+r
--l2stranstest -A/some/file+s -A/some/file+w
--l2stranstest -Afile+e -Afile+r
--l2stranstest -Afile+s -Afile+w
--l2stranstest -C -C1,3-5,7 -Cx -Cy
--l2stranstest -C0 -Ca -Cr
--l2stranstest -E1e-8
Expand All @@ -21,12 +21,12 @@ cat << EOF > $a
--l2stranstest -S -Sf -Sl
--l2stranstest -T10/20/0.5+b -T10/20/0.5+l
--l2stranstest -T10/20/0.5+i -T10/20/0.5+n
--l2stranstest -T/some/file
--l2stranstest -Tfile
EOF

# module-specific longopts
gmt $m $l2s --init=/some/file+evaluate --matrix=/some/file+no_left >> $b
gmt $m $l2s --init=/some/file+sigma --init=/some/file+weights >> $b
gmt $m $l2s --init=file+evaluate --matrix=file+no_left >> $b
gmt $m $l2s --init=file+sigma --init=file+weights >> $b
gmt $m $l2s --columns --columns=1,3-5,7 --columns=x --columns=y >> $b
gmt $m $l2s --columns=0 --columns=a --columns=r >> $b
gmt $m $l2s --eigen=1e-8 >> $b
Expand All @@ -37,6 +37,6 @@ gmt $m $l2s --quick=inch --quick=point --quick=none >> $b
gmt $m $l2s --output --output=first --output=last >> $b
gmt $m $l2s --range=10/20/0.5+log2 --range=10/20/0.5+log10 >> $b
gmt $m $l2s --series=10/20/0.5+inverse --series=10/20/0.5+number >> $b
gmt $m $l2s --series=/some/file >> $b
gmt $m $l2s --series=file >> $b

diff $a $b --strip-trailing-cr > fail
4 changes: 2 additions & 2 deletions test/gmtregress/gmtregress-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cat << EOF > $a
--l2stranstest -Nr -Nw -Nw
--l2stranstest -S -Sr
--l2stranstest -T5/100/2+i -T5+n
--l2stranstest -T/some/file
--l2stranstest -Tfile
--l2stranstest -Wwxyr
--l2stranstest -Wry
--l2stranstest -Z+5 -Z-5
Expand All @@ -36,7 +36,7 @@ gmt $m $l2s --norm=mean_absolute --norm=mean_squared --norm=lms >> $b
gmt $m $l2s --norm=LMS --norm=rms --norm=RMS >> $b
gmt $m $l2s --skip_outliers --restrict_outliers=reverse >> $b
gmt $m $l2s --range=5/100/2+inverse --range=5+number >> $b
gmt $m $l2s --series=/some/file >> $b
gmt $m $l2s --series=file >> $b
gmt $m $l2s --weighted=weights,sigmax,sigmay,correlations >> $b
gmt $m $l2s --weighted=correlations,sigmay >> $b
gmt $m $l2s --limit=+5 --limit=-5 >> $b
Expand Down
16 changes: 8 additions & 8 deletions test/gmtselect/gmtselect-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@ rm -f $a $b ; touch $b
cat << EOF > $a
--l2stranstest -A10/1/2+ags+l+p20
--l2stranstest -A100+aiS+r
--l2stranstest -C/some/sortof/file+d6 -C20/10
--l2stranstest -Csortof/file+d6 -C20/10
--l2stranstest -Df -Dh -Di
--l2stranstest -Dl+f -Dc
--l2stranstest -Efn
--l2stranstest -F/some/file
--l2stranstest -G/some/mask.grd
--l2stranstest -Ffile
--l2stranstest -Gmask.grd
--l2stranstest -Icfglrsz
--l2stranstest -Ilc
--l2stranstest -L/some/file+d3+p
--l2stranstest -Lfile+d3+p
--l2stranstest -Nk/s/k/s/k -Nk/s
--l2stranstest -Z10/20+a+c6 -Z10/20+hk+i
EOF

# module-specific longopts
gmt $m $l2s --min_area=10/1/2+antarctica:gs+lakes+percent:20 >> $b
gmt $m $l2s --area=100+antarctica:iS+river_lakes >> $b
gmt $m $l2s --distance=/some/sortof/file+distance:6 --dist2pt=20/10 >> $b
gmt $m $l2s --distance=sortof/file+distance:6 --dist2pt=20/10 >> $b
gmt $m $l2s --resolution=full --resolution=high --resolution=intermediate >> $b
gmt $m $l2s --resolution=low+lower --resolution=crude >> $b
gmt $m $l2s --boundary=fn >> $b
gmt $m $l2s --polygon=/some/file >> $b
gmt $m $l2s --gridmask=/some/mask.grd >> $b
gmt $m $l2s --polygon=file >> $b
gmt $m $l2s --gridmask=mask.grd >> $b
gmt $m $l2s --reverse=circle,polygons,zero,line,rectangle,gridmask,zrange >> $b
gmt $m $l2s --invert=line,circle >> $b
gmt $m $l2s --dist2line=/some/file+distance:3+project >> $b
gmt $m $l2s --dist2line=file+distance:3+project >> $b
gmt $m $l2s --mask=k/s/k/s/k --maskvalues=k/s >> $b
gmt $m $l2s --in_range=10/20+any+column:6 --in_range=10/20+header:k+invert >> $b

Expand Down
4 changes: 2 additions & 2 deletions test/gmtset/gmtset-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ cat << EOF > $a
--l2stranstest -C
--l2stranstest -Du -Ds
--l2stranstest -Du -Ds
--l2stranstest -G/some/file -G/other/file
--l2stranstest -Gfile -Gother_file
EOF

# module-specific longopts
gmt $m $l2s --convert >> $b
gmt $m $l2s --defaults=us --defaults=si >> $b
gmt $m $l2s --defaults=US --defaults=SI >> $b
gmt $m $l2s --gmtconf=/some/file --defaultsfile=/other/file >> $b
gmt $m $l2s --gmtconf=file --defaultsfile=other_file >> $b

diff $a $b --strip-trailing-cr > fail
12 changes: 6 additions & 6 deletions test/gmtspatial/gmtspatial-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ cat << EOF > $a
--l2stranstest -Aa1m -A
--l2stranstest -C
--l2stranstest -D+a+c0.02+C0.01+d1
--l2stranstest -D+f/a/file+p+s2
--l2stranstest -D+fa/file+p+s2
--l2stranstest -E+p -E+p
--l2stranstest -E+n -E+n
--l2stranstest -Fl
--l2stranstest -Ie -Ii
--l2stranstest -L2/1e-8/1e-8
--l2stranstest -N/p/file+a+i+p6
--l2stranstest -N/p/file+r+z
--l2stranstest -Np/file+a+i+p6
--l2stranstest -Np/file+r+z
--l2stranstest -Qk+c1/2+h+l -Qm+p
--l2stranstest -Qm+sa
--l2stranstest -Sb2 -Sh -Sh
Expand All @@ -33,14 +33,14 @@ EOF
gmt $m $l2s --nn=min_dist:1m --nearest_neighbor >> $b
gmt $m $l2s --clip >> $b
gmt $m $l2s --duplicates+amax+cmax:0.02+cmin:0.01+dmax:1 >> $b
gmt $m $l2s --duplicates+file:/a/file+perpendicular+factor:2 >> $b
gmt $m $l2s --duplicates+file:a/file+perpendicular+factor:2 >> $b
gmt $m $l2s --handedness+positive --handedness+counterclockwise >> $b
gmt $m $l2s --handedness+negative --handedness+clockwise >> $b
gmt $m $l2s --force_polygons=lines >> $b
gmt $m $l2s --intersections=external --intersections=internal >> $b
gmt $m $l2s --no_tile_lines=2/1e-8/1e-8 >> $b
gmt $m $l2s --in_polygons=/p/file+all+individual+start:6 >> $b
gmt $m $l2s --in_polygons=/p/file+report+addcolumn >> $b
gmt $m $l2s --in_polygons=p/file+all+individual+start:6 >> $b
gmt $m $l2s --in_polygons=p/file+report+addcolumn >> $b
gmt $m $l2s --centroid=k+range:1/2+header+lines --area=m+close >> $b
gmt $m $l2s --length=m+sort:a >> $b
gmt $m $l2s --spatial=buffer:2 --spatial=hole --spatial=holes >> $b
Expand Down
4 changes: 2 additions & 2 deletions test/grd2cpt/grd2cpt-l2s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rm -f $a $b ; touch $b

cat << EOF > $a
--l2stranstest -A50+a
--l2stranstest -C/some/file.cpt -C/some/file.cpt
--l2stranstest -Cfile.cpt -Cfile.cpt
--l2stranstest -Di -Do
--l2stranstest -E4+c+f
--l2stranstest -Fc -Fg -Fh+kD
Expand All @@ -31,7 +31,7 @@ EOF

# module-specific longopts
gmt $m $l2s --alpha=50+all >> $b
gmt $m $l2s --cpt=/some/file.cpt --cmap=/some/file.cpt >> $b
gmt $m $l2s --cpt=file.cpt --cmap=file.cpt >> $b
gmt $m $l2s --bg=in --background=out >> $b
gmt $m $l2s --nlevels=4+cumulative+file >> $b
gmt $m $l2s --format=cmyk --color_model=gray --format=hsv+key:D >> $b
Expand Down
Loading
Loading