From: Dwight Perry Date: Fri, 2 Mar 2012 22:41:19 +0000 (-0500) Subject: Added support for Apple imagepath testing. X-Git-Tag: LAST_LIBGRAPH~32^2~466^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=953656a5f73d50fc3c22d210bab2dea32a8c9d84;p=graphviz Added support for Apple imagepath testing. --- diff --git a/rtest/graphs/inv_inv.gv b/rtest/graphs/inv_inv.gv new file mode 100644 index 000000000..06c192a76 --- /dev/null +++ b/rtest/graphs/inv_inv.gv @@ -0,0 +1,10 @@ +graph G { imagepath="/inv_dir/" + +a[shape=plaintext,label=<
+ +
image attribute (invalid absolute pathname)
imagepath attribute (invalid absolute pathname)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="no image should be displayed",image="/inv_dir/image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/inv_nul.gv b/rtest/graphs/inv_nul.gv new file mode 100644 index 000000000..fca86031a --- /dev/null +++ b/rtest/graphs/inv_nul.gv @@ -0,0 +1,10 @@ +graph G { imagepath="" + +a[shape=plaintext,label=<
+ +
image attribute (invalid absolute pathname)
imagepath attribute (null)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="no image should be displayed",image="/inv_dir/image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/inv_val.gv b/rtest/graphs/inv_val.gv new file mode 100644 index 000000000..5e87398e3 --- /dev/null +++ b/rtest/graphs/inv_val.gv @@ -0,0 +1,10 @@ +graph G { imagepath="/home/dperry/work_related/graphviz_repos/graphviz/rtest/imagepath_test/imagepath_dir/" + +a[shape=plaintext,label=<
+ +
image attribute (invalid absolute pathname)
imagepath attribute (valid absolute pathname)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="no image should be displayed",image="/inv_dir/image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/nul_inv.gv b/rtest/graphs/nul_inv.gv new file mode 100644 index 000000000..b6f37f091 --- /dev/null +++ b/rtest/graphs/nul_inv.gv @@ -0,0 +1,10 @@ +graph G { imagepath="/inv_dir/" + +a[shape=plaintext,label=<
+ +
image attribute (null)
imagepath attribute (invalid absolute pathname)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="no image for Graphviz.app, else image from working directory",image="image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/nul_nul.gv b/rtest/graphs/nul_nul.gv new file mode 100644 index 000000000..f6f87e91c --- /dev/null +++ b/rtest/graphs/nul_nul.gv @@ -0,0 +1,10 @@ +graph G { imagepath="" + +a[shape=plaintext,label=<
+ +
image attribute (null)
imagepath attribute (null)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="image in working directory should be displayed",image="image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/nul_val.gv b/rtest/graphs/nul_val.gv new file mode 100644 index 000000000..b14a818e5 --- /dev/null +++ b/rtest/graphs/nul_val.gv @@ -0,0 +1,10 @@ +graph G { imagepath="/home/dperry/work_related/graphviz_repos/graphviz/rtest/imagepath_test/imagepath_dir/" + +a[shape=plaintext,label=<
+ +
image attribute (null)
imagepath attribute (valid absolute pathname)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="image from imagepath attribute directory or working directory should be displayed",image="image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/val_inv.gv b/rtest/graphs/val_inv.gv new file mode 100644 index 000000000..0998ab248 --- /dev/null +++ b/rtest/graphs/val_inv.gv @@ -0,0 +1,10 @@ +graph G { imagepath="/inv_dir/" + +a[shape=plaintext,label=<
+ +
image attribute (valid absolute pathname)
imagepath attribute (invalid absolute pathname)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="image from image attribute directory should be displayed",image="/home/dperry/work_related/graphviz_repos/graphviz/rtest/imagepath_test/image_dir/image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/val_nul.gv b/rtest/graphs/val_nul.gv new file mode 100644 index 000000000..b34155fbd --- /dev/null +++ b/rtest/graphs/val_nul.gv @@ -0,0 +1,10 @@ +graph G { imagepath="" + +a[shape=plaintext,label=<
+ +
image attribute (valid absolute pathname)
imagepath attribute (null)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="image from image attribute directory should be displayed",image="/home/dperry/work_related/graphviz_repos/graphviz/rtest/imagepath_test/image_dir/image.jpg",labelloc=b]; +} + diff --git a/rtest/graphs/val_val.gv b/rtest/graphs/val_val.gv new file mode 100644 index 000000000..66ac1fe19 --- /dev/null +++ b/rtest/graphs/val_val.gv @@ -0,0 +1,10 @@ +graph G { imagepath="/home/dperry/work_related/graphviz_repos/graphviz/rtest/imagepath_test/imagepath_dir/" + +a[shape=plaintext,label=<
+ +
image attribute (valid absolute pathname)
imagepath attribute (valid absolute pathname)
>]; +b[shape=box,fontsize=30,fontname="Helvetica-Bold",label="image from image attribute directory should be displayed",image="/home/dperry/work_related/graphviz_repos/graphviz/rtest/imagepath_test/image_dir/image.jpg",labelloc=b]; +} + diff --git a/rtest/imagepath_test/gen_graph.sh b/rtest/imagepath_test/gen_graph.sh index 4477d6bda..b38320884 100755 --- a/rtest/imagepath_test/gen_graph.sh +++ b/rtest/imagepath_test/gen_graph.sh @@ -95,6 +95,6 @@ sed -e s/image_attr/image\=\"${image}image.jpg\",labelloc=b/ \ -e s/imagepath_attr/imagepath\=\"${imagepath}\"/ base.gv | tr '^' ' ' > ../graphs/${outfile}.gv #place the image file into the nshare directory -dot -Tpng -o nshare/${outfile}_dot.png ../graphs/${outfile}.gv +dot -Tpng -o ../nshare/${outfile}_dot.png ../graphs/${outfile}.gv diff --git a/rtest/imagepath_test/imagepath_test.sh b/rtest/imagepath_test/imagepath_test.sh index 4b9db1d1b..9c3c768a5 100755 --- a/rtest/imagepath_test/imagepath_test.sh +++ b/rtest/imagepath_test/imagepath_test.sh @@ -1,3 +1,4 @@ +#!/home/dperry/work_related/packages/arch/linux.i386-64/src/cmd/ksh93/ksh #! /bin/ksh let count=1 diff --git a/rtest/nshare/ZapfChancery_dot.png b/rtest/nshare/ZapfChancery_dot.png index b3f7e2f60..e60600531 100644 Binary files a/rtest/nshare/ZapfChancery_dot.png and b/rtest/nshare/ZapfChancery_dot.png differ diff --git a/rtest/nshare/inv_inv_dot.png b/rtest/nshare/inv_inv_dot.png new file mode 100644 index 000000000..1b4b67ce0 Binary files /dev/null and b/rtest/nshare/inv_inv_dot.png differ diff --git a/rtest/nshare/inv_nul_dot.png b/rtest/nshare/inv_nul_dot.png new file mode 100644 index 000000000..593ba36fa Binary files /dev/null and b/rtest/nshare/inv_nul_dot.png differ diff --git a/rtest/nshare/inv_val_dot.png b/rtest/nshare/inv_val_dot.png new file mode 100644 index 000000000..75bc02d38 Binary files /dev/null and b/rtest/nshare/inv_val_dot.png differ diff --git a/rtest/nshare/nul_inv_dot.png b/rtest/nshare/nul_inv_dot.png new file mode 100644 index 000000000..c6261d71d Binary files /dev/null and b/rtest/nshare/nul_inv_dot.png differ diff --git a/rtest/nshare/nul_nul_dot.png b/rtest/nshare/nul_nul_dot.png new file mode 100644 index 000000000..f99eeff15 Binary files /dev/null and b/rtest/nshare/nul_nul_dot.png differ diff --git a/rtest/nshare/nul_val_dot.png b/rtest/nshare/nul_val_dot.png new file mode 100644 index 000000000..042adcd59 Binary files /dev/null and b/rtest/nshare/nul_val_dot.png differ diff --git a/rtest/nshare/val_inv_dot.png b/rtest/nshare/val_inv_dot.png new file mode 100644 index 000000000..156c54d9e Binary files /dev/null and b/rtest/nshare/val_inv_dot.png differ diff --git a/rtest/nshare/val_nul_dot.png b/rtest/nshare/val_nul_dot.png new file mode 100644 index 000000000..882c5ca37 Binary files /dev/null and b/rtest/nshare/val_nul_dot.png differ diff --git a/rtest/nshare/val_val_dot.png b/rtest/nshare/val_val_dot.png new file mode 100644 index 000000000..db6e26518 Binary files /dev/null and b/rtest/nshare/val_val_dot.png differ diff --git a/rtest/table_rules_test.txt b/rtest/table_rules_test.txt deleted file mode 100644 index 8bc050b7d..000000000 --- a/rtest/table_rules_test.txt +++ /dev/null @@ -1,44 +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. - -rd_tbl_basic -= -dot png - -rd_tbl_border -= -dot png - -rd_tbl_all -= -dot png - -sq_tbl_basic -= -dot png - -sq_tbl_border -= -dot png - -sq_tbl_all -= -dot png - - - -