GenericMappingTools · maxrjones · Feb 7, 2022 · Feb 4, 2022 · Feb 4, 2022 · Feb 4, 2022
diff --git a/doc/examples/images.dvc b/doc/examples/images.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: 891a693c24ee65a30c639953b3817038.dir
-  size: 34612020
+- md5: b9a74e1d6fecbf50b8c510188b0c528d.dir
+  size: 34612929
   nfiles: 53
   path: images
diff --git a/doc/rst/source/devdocs/contributing.rst b/doc/rst/source/devdocs/contributing.rst
@@ -459,8 +459,6 @@ Migrating existing test images to dvc
 #. Remove the test image from git tracking (``git rm --cached <module>/<test-image>.ps``).
 #. Create a new directory for the image in ``baseline``, if one does not already exist (``mkdir baseline/<module>``).
 #. Move the test image to the new directory (``mv <module>/<test-image>.ps baseline/<module>/``).
-#. Add a comment ``# DVC_TEST`` to the test script that references the image. This is used to specify that the testing
-   mechanism should search in ``baseline/<module>`` for the baseline image.
 #. Repeat steps 4, 6, and 7 for other .PS based tests for the module.
 #. Run the GMT test suite to check that the tests work properly with the new structure.
 #. Add the directory to dvc (``dvc add baseline/<module>``).

diff --git a/doc/scripts/images.dvc b/doc/scripts/images.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: fec006baaf50880d191eeac5ab354de2.dir
-  size: 18620823
+- md5: ad2a5dfef1fb6197fb8a929fb80a587c.dir
+  size: 18609653
   nfiles: 193
   path: images
diff --git a/test/api/apicubeplot.sh b/test/api/apicubeplot.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #
 # Test the C API for reading via a matrix and making a plot
-# DVC_TEST
 ps=apicubeplot.ps
 if [ ! -f cube.nc ]; then
 	cp "${src}"/../grdinterpolate/cube.nc .

diff --git a/test/api/apigrdpix.sh b/test/api/apigrdpix.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
 # Test the C API for passing matrices to grdimage as grids
-# DVC_TEST
 ps=api_matrix_as_grid.ps
 testapi_matrix_as_grid
diff --git a/test/api/apimat2grd.sh b/test/api/apimat2grd.sh
@@ -2,7 +2,6 @@
 #
 # Test the C API for passing a global grid as a matrix to grdimage
 # and have the central meridian work correctly.
-# DVC_TEST
 
 ps=apimat2grd.ps
 testapi_grid2matrix

diff --git a/test/api/apimat_360.sh b/test/api/apimat_360.sh
@@ -2,7 +2,6 @@
 #
 # Test the C API for passing a global grid as a matrix to grdimage
 # and have the central meridian work correctly.
-# DVC_TEST
 
 ps=apimat_360.ps
 testapi_matrix_360 > $ps
diff --git a/test/api/apimat_360_ref.sh b/test/api/apimat_360_ref.sh
@@ -2,7 +2,6 @@
 #
 # Test the C API for passing a global grid as a matrix to grdimage via reference
 # and have the central meridian work correctly.
-# DVC_TEST
 
 ps=apimat_360_ref.ps
 testapi_matrix_360_ref > $ps
diff --git a/test/api/apimat_io.sh b/test/api/apimat_io.sh
@@ -2,7 +2,6 @@
 #
 # Test the C API for reading and writing native matrices.
 # We read @hotspots.txt and write it out again, then plot it.
-# DVC_TEST
 
 ps=apimat_io.ps
 testapi_matrix_io

diff --git a/test/api/apimatgrd.sh b/test/api/apimatgrd.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
 # Test the C API for reading grd plotting matrix
-# DVC_TEST
 ps=apimatgrd.ps
 testapi_matrix_plot > $ps
diff --git a/test/api/apimatimageplain.sh b/test/api/apimatimageplain.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
 # Test the C API for reading via a matrix and making a plot
-# DVC_TEST
 ps=apimatimageplain.ps
 testapi_imageshading > $ps
diff --git a/test/api/apimatimageshading.sh b/test/api/apimatimageshading.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
 # Test the C API for reading via a matrix and making a plot with shading
-# DVC_TEST
 ps=apimatimageshading.ps
 testapi_imageshading -I > $ps
diff --git a/test/api/apiuserstrings.sh b/test/api/apiuserstrings.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 #
 # Test the C API for passing vectors and strings to pstext
-# DVC_TEST
 ps=apiuserstrings.ps
 testapi_vector_strings > $ps
diff --git a/test/api/apivec_io.sh b/test/api/apivec_io.sh
@@ -2,7 +2,6 @@
 #
 # Test the C API for reading and writing native vectors.
 # We read @hotspots.txt and write it out again, then plot it.
-# DVC_TEST
 
 ps=apivec_io.ps
 testapi_vector_io

diff --git a/test/api/apivectorplot.sh b/test/api/apivectorplot.sh
@@ -2,6 +2,5 @@
 #
 # Test the C API for plotting lines with arrows
 # See https://github.com/GenericMappingTools/gmt/pull/3528
-# DVC_TEST
 ps=apivectorplot.ps
 testapi_vector_plot > $ps
diff --git a/test/baseline/.gitignore b/test/baseline/.gitignore
@@ -31,3 +31,62 @@
 /grdsample
 /potential
 /pssolar
+/x2sys
+/triangulate
+/trend1d
+/trend2d
+/time
+/spotter
+/sph2grd
+/spectrum1d
+/seis
+/segy
+/psxyz
+/pswiggle
+/pstext
+/psternary
+/psscale
+/pssac
+/psrose
+/psmask
+/pspolar
+/psimage
+/psevents
+/pscontour
+/psclip
+/project
+/postscriptlight
+/ogr
+/nearneighbor
+/movie
+/mgd77
+/makecpt
+/latex
+/kml
+/img
+/gshhg
+/grdvolume
+/grdtrend
+/grdtrack
+/grdmix
+/grdlandmask
+/grdgradient
+/grdgdal
+/grdfft
+/grdedit
+/grdclip
+/grdblend
+/grd2xyz
+/gmtvector
+/gmtsplit
+/gmtsimplify
+/gmtselect
+/gmtregress
+/gmtmath
+/gmtlogo
+/gmtconvert
+/gmtconnect
+/gmtbinstats
+/geodesy
+/fitcircle
+/filter1d
diff --git a/test/baseline/filter1d.dvc b/test/baseline/filter1d.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 17eb890ce6ca5e7c8a6d8d6b124420ac.dir
+  size: 251237
+  nfiles: 6
+  path: filter1d
diff --git a/test/baseline/fitcircle.dvc b/test/baseline/fitcircle.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 3d146d356a73b93a3147dbe88384261c.dir
+  size: 116758
+  nfiles: 1
+  path: fitcircle
diff --git a/test/baseline/genper.dvc b/test/baseline/genper.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: a946de6164e0a64c25827bb936b2a68f.dir
-  size: 920371
-  nfiles: 6
+- md5: 1b192d9f9357e8471dfef7c87d0a0938.dir
+  size: 4088182
+  nfiles: 20
   path: genper
diff --git a/test/baseline/geodesy.dvc b/test/baseline/geodesy.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: e31eae40b53f2c6711aa850f51bc2eb7.dir
+  size: 3650328
+  nfiles: 15
+  path: geodesy
diff --git a/test/baseline/gmtbinstats.dvc b/test/baseline/gmtbinstats.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 1c899bb3e42b303b91e36e4e3ba30c1e.dir
+  size: 758018
+  nfiles: 6
+  path: gmtbinstats
diff --git a/test/baseline/gmtconnect.dvc b/test/baseline/gmtconnect.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 51914fa7d4bc4409cf4566d5affe2024.dir
+  size: 33350
+  nfiles: 1
+  path: gmtconnect
diff --git a/test/baseline/gmtconvert.dvc b/test/baseline/gmtconvert.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: d85339d18ffd80f9db5cd12e6e556dda.dir
+  size: 71118
+  nfiles: 2
+  path: gmtconvert
diff --git a/test/baseline/gmtlogo.dvc b/test/baseline/gmtlogo.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: ef8c5650748bf063179d9303bfc73c09.dir
+  size: 514800
+  nfiles: 1
+  path: gmtlogo
diff --git a/test/baseline/gmtmath.dvc b/test/baseline/gmtmath.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: a909681cc5b43acbcf155499ca8e1e9e.dir
+  size: 197218
+  nfiles: 5
+  path: gmtmath
diff --git a/test/baseline/gmtmex.dvc b/test/baseline/gmtmex.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: 2f77bfbe6e268cd90decdffe732eb50c.dir
-  size: 2480485
+- md5: 62aa10dd47eedb69073cc06450a315ec.dir
+  size: 2480646
   nfiles: 3
   path: gmtmex
diff --git a/test/baseline/gmtregress.dvc b/test/baseline/gmtregress.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 53d07fa45fe6a1ea795036f5a0b6fefb.dir
+  size: 347468
+  nfiles: 5
+  path: gmtregress
diff --git a/test/baseline/gmtselect.dvc b/test/baseline/gmtselect.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: dd2f8187016c620442cc37237ea6719d.dir
+  size: 311659
+  nfiles: 3
+  path: gmtselect
diff --git a/test/baseline/gmtsimplify.dvc b/test/baseline/gmtsimplify.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: ad15e54c2c97b932f8758c2092824688.dir
+  size: 844101
+  nfiles: 1
+  path: gmtsimplify
diff --git a/test/baseline/gmtspatial.dvc b/test/baseline/gmtspatial.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: 97ad060feda2d86918d69eb494901f0b.dir
-  size: 71858
-  nfiles: 2
+- md5: d2b6866973d0cc60254be54a4a4536dc.dir
+  size: 642598
+  nfiles: 10
   path: gmtspatial
diff --git a/test/baseline/gmtsplit.dvc b/test/baseline/gmtsplit.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 7586758d5877717f63e731b07be746c8.dir
+  size: 24177
+  nfiles: 1
+  path: gmtsplit
diff --git a/test/baseline/gmtvector.dvc b/test/baseline/gmtvector.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: b037b0df3183efa86c4f58ca2ebe321a.dir
+  size: 107300
+  nfiles: 3
+  path: gmtvector
diff --git a/test/baseline/grd2xyz.dvc b/test/baseline/grd2xyz.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 515cb6fca8752bfb41113d53e47fb618.dir
+  size: 72261
+  nfiles: 1
+  path: grd2xyz
diff --git a/test/baseline/grdblend.dvc b/test/baseline/grdblend.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 6529309a01695a8f83654062b833a383.dir
+  size: 316937
+  nfiles: 8
+  path: grdblend
diff --git a/test/baseline/grdclip.dvc b/test/baseline/grdclip.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: bb64bad008eb2d6c5674f47429e04dab.dir
+  size: 125942
+  nfiles: 1
+  path: grdclip
diff --git a/test/baseline/grdedit.dvc b/test/baseline/grdedit.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: f2efeaf06b7c4632d8b9a5954378d365.dir
+  size: 466057
+  nfiles: 3
+  path: grdedit
diff --git a/test/baseline/grdfft.dvc b/test/baseline/grdfft.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: b948b8870df5f76c1a408827756fb9de.dir
+  size: 1281033
+  nfiles: 7
+  path: grdfft
diff --git a/test/baseline/grdgdal.dvc b/test/baseline/grdgdal.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: cb81159dd8a40497b6aa7499d5c4dfcb.dir
+  size: 24997
+  nfiles: 1
+  path: grdgdal
diff --git a/test/baseline/grdgradient.dvc b/test/baseline/grdgradient.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: b9407eab4b5bfa2882be7c7bad88a838.dir
+  size: 1651104
+  nfiles: 5
+  path: grdgradient
diff --git a/test/baseline/grdimage.dvc b/test/baseline/grdimage.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: fd665378d77e257c792d2581d671e82e.dir
-  size: 8683519
+- md5: a3a20cb8950ff2bc3a73158f2ddf458b.dir
+  size: 8683510
   nfiles: 30
   path: grdimage
diff --git a/test/baseline/grdlandmask.dvc b/test/baseline/grdlandmask.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: efc18c461dc115ce2e6f14da7bd261b8.dir
+  size: 178104
+  nfiles: 5
+  path: grdlandmask
diff --git a/test/baseline/grdmask.dvc b/test/baseline/grdmask.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: ff5887651db82e7fe3c59fa9944a227d.dir
-  size: 246521
-  nfiles: 6
+- md5: 2f7463f01e6e8fc125a3ec3f08b2b04a.dir
+  size: 284684
+  nfiles: 7
   path: grdmask
diff --git a/test/baseline/grdmix.dvc b/test/baseline/grdmix.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 34cbcc424bd5ec8c24e637bb6b7c4525.dir
+  size: 241450
+  nfiles: 2
+  path: grdmix
diff --git a/test/baseline/grdpaste.dvc b/test/baseline/grdpaste.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: 22bed5622209230157e448ce686dc1d4.dir
-  size: 54792
-  nfiles: 1
+- md5: f69906f1ad317e2105eec1b1fcee8362.dir
+  size: 246092
+  nfiles: 5
   path: grdpaste
diff --git a/test/baseline/grdselect.dvc b/test/baseline/grdselect.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: f12d3d3382b8942d0dbadceff9c748c9.dir
-  size: 35831
-  nfiles: 1
+- md5: eea2d1abf7e04bcd1088c6ef425742ad.dir
+  size: 106992
+  nfiles: 2
   path: grdselect
diff --git a/test/baseline/grdtrack.dvc b/test/baseline/grdtrack.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 16b1149e8e1793a42baa9cb440fd5b6e.dir
+  size: 234507
+  nfiles: 5
+  path: grdtrack
diff --git a/test/baseline/grdtrend.dvc b/test/baseline/grdtrend.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 5ca2f14b9f2256aa7213339aaadb2abe.dir
+  size: 1453855
+  nfiles: 2
+  path: grdtrend
diff --git a/test/baseline/grdvector.dvc b/test/baseline/grdvector.dvc
@@ -1,5 +1,5 @@
 outs:
-- md5: c2431b5811b48fa22eae6b7c8e416b8b.dir
-  size: 171597
-  nfiles: 3
+- md5: 752b35fff020e0e8596263531ca31881.dir
+  size: 1445159
+  nfiles: 15
   path: grdvector
diff --git a/test/baseline/grdvolume.dvc b/test/baseline/grdvolume.dvc
@@ -0,0 +1,5 @@
+outs:
+- md5: 5dbd18ee6a3d9c634b837dcf0a890519.dir
+  size: 135887
+  nfiles: 1
+  path: grdvolume