tests: remove test_regression_subset_differences test

Upcoming commits will step by step make changes that affect the layout
and there's too much work to maintain the reference files, since they
differ slightly across operating systems. We only checked for
difference for a very small fraction of the subtests anyway so this
test did not add much value.

Note that the test_regression_failure test remains. It checks the exit
status of each subtest, but does not compare with reference files.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1ef11971fe743578e2a1454115ac4de6d013d973..579a2dbffa688cd7edc9ec065a09265ccc85c13b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,4 +2,4 @@
 
 SUBDIRS = graphs linux.x86 unit_tests regression_tests
 
-EXTRA_DIST = graphs nshare rtest.py tests.txt tests_subset.txt test_regression.py
+EXTRA_DIST = graphs nshare rtest.py tests.txt test_regression.py

diff --git a/tests/test_regression.py b/tests/test_regression.py
index 75e817c01bd3f5467f0fd4254d194ff0d9898f4f..3f5f9f6750d4ac27184daeffb16e4f173b87013f 100644 (file)
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@ -43,20 +43,11 @@ def is_ndebug_defined() -> bool:
 # saying "== Failed ==" which thus is not counted as a failure at the
 # end.
 
-def test_regression_subset_differences():
-  """
-  First run a subset of all the tests that produces equal output files
-  for all platforms and fail the test if there are differences.
-  """
-
-  os.chdir(Path(__file__).resolve().parent)
-  subprocess.check_call([sys.executable, "rtest.py", "tests_subset.txt"])
-
 def test_regression_failure():
   """
-  Secondly, run all tests but ignore differences and fail the test
-  only if there is a crash. This will leave the differences for png
-  output in tests/nhtml/index.html for review.
+  Run all tests but ignore differences and fail the test only if there is a
+  crash. This will leave the differences for png output in
+  tests/nhtml/index.html for review.
   """
 
   os.chdir(Path(__file__).resolve().parent)

diff --git a/tests/tests_subset.txt b/tests/tests_subset.txt
deleted file mode 100644 (file)
index cfba083..0000000
--- a/tests/tests_subset.txt
+++ /dev/null
@@ -1,347 +0,0 @@
-# Graphviz test suite
-# Tests are separated by blank or comment lines.
-# Tests have the following syntax:
-#  testname
-#  Test input (one-line graph or name of .gv file or =)
-#    In the last case, the input file is taken as testname.gv
-#  One or more subtests of the form:
-#     layout_alg output_format additional_flags
-#
-# For example, the test
-#   Shapes
-#   shapes.gv
-#   dot ps
-#   neato png "-Gsize=3,3 -Ncolor=red"
-# specifies the "shapes" test, using shapes.gv as input, and
-# run "dot -Tps" and "neato -Tpng -Gsize=3,3 -Ncolor=red" on the input.
-
-#shapes
-#=
-#dot gv
-#dot ps
-
-#crazy
-#=
-#dot png
-#dot ps
-
-arrows
-=
-dot gv
-#dot ps
-
-#arrowsize
-#=
-#dot png
-
-#center
-#=
-#dot ps
-#dot png -Gmargin=1
-
-## color encodings
-## multiple edge colors
-#color
-#=
-#dot png
-#dot png -Gbgcolor=lightblue
-
-#decorate
-#=
-#dot png
-
-#record
-#=
-#dot gv
-#dot ps
-
-#html
-#=
-#dot gv
-#dot ps
-
-#html2
-#=
-#dot gv
-#dot ps
-#dot svg
-
-#pslib
-#=
-#dot ps -lgraphs/sdl.ps
-
-#user_shapes
-#=
-#dot ps
-#dot png:gd
-##dot png - doesn't work: Warning: No loadimage plugin for "gif:cairo"
-
-# bug - the epsf version has problems
-ps_user_shapes
-=
-dot ps -Nshapefile=graphs/dice.ps
-##dot ps -Nshape=epsf -Nshapefile=graphs/dice.ps
-
-#colorscheme
-#=
-#dot ps
-#dot png
-
-compound
-=
-dot gv
-
-#dir
-#=
-#dot ps
-
-#clusters
-#=
-#dot ps
-#dot png
-
-#clustlabel
-#=
-#dot ps -Glabelloc=t -Glabeljust=r
-#dot ps -Glabelloc=b -Glabeljust=r
-#dot ps -Glabelloc=t -Glabeljust=l
-#dot ps -Glabelloc=b -Glabeljust=l
-#dot ps -Glabelloc=t -Glabeljust=c
-#dot ps -Glabelloc=b -Glabeljust=c
-#dot ps -Glabelloc=t
-#dot ps -Glabelloc=b
-
-#rootlabel
-#=
-#dot ps -Glabelloc=t -Glabeljust=r
-#dot ps -Glabelloc=b -Glabeljust=r
-#dot ps -Glabelloc=t -Glabeljust=l
-#dot ps -Glabelloc=b -Glabeljust=l
-#dot ps -Glabelloc=t -Glabeljust=c
-#dot ps -Glabelloc=b -Glabeljust=c
-#dot ps -Glabelloc=t
-#dot ps -Glabelloc=b
-
-#layers
-#=
-#dot ps
-
-## check mode=hier
-#mode
-#=
-#neato ps -Gmode=KK
-#neato ps -Gmode=hier
-#neato ps -Gmode=hier -Glevelsgap=1
-
-#model
-#mode.gv
-#neato ps -Gmodel=circuit
-#neato ps -Goverlap=false -Gmodel=subset
-
-## cairo versions have problems
-#nojustify
-#=
-#dot png
-#dot png:gd
-#dot ps
-#dot ps:cairo
-
-# bug
-ordering
-=
-dot gv -Gordering=in
-dot gv -Gordering=out
-
-#overlap
-#=
-#neato gv -Goverlap=false
-#neato gv -Goverlap=scale
-
-#pack
-#=
-#neato gv
-#neato gv -Gpack=20
-#neato gv -Gpackmode=graph
-
-#page
-#mode.gv
-#neato ps -Gpage=8.5,11
-#neato ps -Gpage=8.5,11 -Gpagedir=TL
-#neato ps -Gpage=8.5,11 -Gpagedir=TR
-
-## pencolor, fontcolor, fillcolor
-#colors
-#=
-#dot ps
-
-#polypoly
-#=
-#dot ps
-#dot png
-
-#ports
-#=
-#dot gv
-
-#rotate
-#crazy.gv
-#dot png -Glandscape
-#dot ps -Glandscape
-#dot png -Grotate=90
-#dot ps -Grotate=90
-
-#rankdir
-#crazy.gv
-#dot gv -Grankdir=LR
-#dot gv -Grankdir=BT
-#dot gv -Grankdir=RL
-
-#url
-#=
-#dot ps2
-#dot svg -Gstylesheet=stylesheet
-#dot imap
-#dot cmapx
-#dot imap_np
-#dot cmapx_np
-
-#viewport
-#=
-#neato png -Gviewport=300,300 -n2
-#neato ps -Gviewport=300,300 -n2
-#neato png -Gviewport=300,300,1,200,620 -n2
-#neato ps -Gviewport=300,300,1,200,620 -n2
-#neato png -Gviewport=300,300,2,200,620 -n2
-#neato ps -Gviewport=300,300,2,200,620 -n2
-
-rowcolsep
-=
-dot gv -Gnodesep=0.5
-dot gv -Granksep=1.5
-
-#size
-#mode.gv
-#neato ps -Gsize=5,5
-#neato png -Gsize=5,5
-
-## size with !
-#size_ex
-#root.gv
-#dot ps -Gsize=6,6!
-#dot png -Gsize=6,6!
-
-#dotsplines
-#size.gv
-#dot gv -Gsplines=line
-#dot gv -Gsplines=polyline
-##dot gv -Gsplines=ortho
-
-#neatosplines
-#overlap.gv
-#neato gv -Goverlap=false -Gsplines
-#neato gv -Goverlap=false -Gsplines=polyline
-##neato gv -Goverlap=false -Gsplines=ortho
-
-#style
-#=
-#dot ps
-#dot png
-
-# edge clipping
-edgeclip
-=
-dot gv
-
-## edge weight
-#weight
-#=
-#dot gv
-
-#root
-#=
-#twopi gv
-
-#cairo
-#=
-#dot ps:cairo
-#dot png:cairo
-#dot svg:cairo
-
-#flatedge
-#=
-#dot gv
-
-nestedclust
-=
-dot gv
-
-#rd_rules
-#=
-#dot png
-
-#sq_rules
-#=
-#dot png
-
-## FIXME: Re-enable when https://gitlab.com/graphviz/graphviz/-/issues/1690 is fixed
-##fdp_clus
-##fdp.gv
-##fdp png
-
-#japanese
-#=
-#dot png
-
-#russian
-#=
-#dot png
-
-#AvantGarde
-#=
-#dot png
-#dot ps
-
-#Bookman
-#=
-#dot png
-#dot ps
-
-#Helvetica
-#=
-#dot png
-#dot ps
-
-#NewCenturySchlbk
-#=
-#dot png
-#dot ps
-
-#Palatino
-#=
-#dot png
-#dot ps
-
-#Times
-#=
-#dot png
-#dot ps
-
-#ZapfChancery
-#=
-#dot png
-#dot ps
-
-#ZapfDingbats
-#=
-#dot png
-#dot ps
-
-#xlabels
-#=
-#dot png
-#neato png
-
-#sides
-#=
-#dot ps
-