[med-svn] [figtree] 01/01: Adding two example tree files and avoiding the graphical output during the autopkgtest

[Katerina Kalou]

This is an automated email from the git hooks/post-receive script.

kkalou-guest pushed a commit to branch master
in repository figtree.

commit 366bac911ede1b5b4ebcfb8871a479ca5f868c4e
Author: kkalou-guest <aik.kalou at gmail.com>
Date:   Thu Dec 14 17:03:08 2017 +0200

    Adding two example tree files and avoiding the graphical output during the autopkgtest
---
 debian/tests/control            |  2 +-
 debian/tests/run-unit-test      | 14 +++++++++-----
 examples/HA_continuous_MCC.tree |  4 ++++
 examples/HA_discrete_MCC.tree   |  4 ++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 41a333e..5e354aa 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: run-unit-test
-Depends: @, xvfb
+Depends: @
 Restrictions: allow-stderr
 
 
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 06bd154..fb65245 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -14,8 +14,12 @@ gunzip -r *
 
 # Problem: figtree creates graphical output and requires user interaction to end
 # Hack around: start figtree in background and kill all figtree processes started by the current user
-xvfb-run --auto-servernum figtree HA_continuous_MCC.tre HA_discrete_MCC.tre &
-figtree -graphic PDF test.tree test.pdf
-figtree -graphic GIF -width 320 -height 320 test.tree test.gif
-sleep 10
-kill -9 `ps aux | grep -w "^${USER}.*figtree" | grep -v "0:0[0-9] grep " | grep -v "0:0[0-9] ps " | sed "s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`
+# xvfb-run --auto-servernum
+# figtree HA_continuous_MCC.tre HA_discrete_MCC.tre 
+
+# Still testing around a way to export and save the tree without user interaction.
+figtree -graphic PDF HA_continuous_MCC.tree HA_continuous_MCC.pdf
+figtree -graphic GIF -width 320 -height 320 HA_continuous_MCC.tree HA_continuous_MCC.png
+
+#sleep 10
+#kill -9 `ps aux | grep -w "^${USER}.*figtree" | grep -v "0:0[0-9] grep " | grep -v "0:0[0-9] ps " | sed "s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`
diff --git a/examples/HA_continuous_MCC.tree b/examples/HA_continuous_MCC.tree
new file mode 100644
index 0000000..29f5a84
--- /dev/null
+++ b/examples/HA_continuous_MCC.tree
@@ -0,0 +1,4 @@
+#NEXUS
+begin trees;
+	tree TREE1 = [&R] ((((A_duck_Guangdong_12_2000:1.384182,(A_duck_Shanghai_08_2001:1.84538,A_duck_Fujian_19_2000:0.84538):0.538802):2.545467,((A_duck_Guangdong_07_2000:1.389358,((A_duck_Guangdong_40_2000:0.56791,((A_duck_Shanghai_35_2002:1.25091,A_duck_Shanghai_38_2001:0.25091):0.17957,(A_duck_Guangxi_53_2002:0.922862,((A_duck_Fujian_13_2002:0.60886,(A_duck_Fujian_01_2002:0.48739,(A_chicken_zhoukou_2_2002:0.342877,A_chicken_Hebei_108_2002:0.342877):0.144513):0.12147):0.177831,A_duck_Shang [...]
+end;
diff --git a/examples/HA_discrete_MCC.tree b/examples/HA_discrete_MCC.tree
new file mode 100644
index 0000000..06bab48
--- /dev/null
+++ b/examples/HA_discrete_MCC.tree
@@ -0,0 +1,4 @@
+#NEXUS
+begin trees;
+	tree TREE1 = [&R] (((A_Goose_Guangdong_1_1996:0.551287,((A_duck_Fujian_19_2000:1.14142,A_duck_Guangdong_12_2000:1.14142):0.422917,A_duck_Shanghai_08_2001:2.564337):2.98695):0.233763,(((((((A_duck_Shantou_4610_2003:2.828743,(A_duck_Guangxi_50_2001:0.584214,((((A_Goose_Shantou_1621_2005:0.573208,(A_duck_Fujian_897_2005:0.217498,A_chicken_Fujian_1042_2005:0.217498):0.35571):0.127905,A_goose_Shantou_2216_2005:0.701113):3.271038,(A_chicken_HongKongi_863_2002:0.182239,A_Ck_HK_619_2002:0.18223 [...]
+end;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/figtree.git