Merge remote-tracking branch 'lmr/add-simpletest-examples'

avocado-framework · Jul 7, 2015 · fe3e5c1 · fe3e5c1
2 parents ced499c + 8b1ae41
commit fe3e5c1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/avocado.spec b/avocado.spec
@@ -100,6 +100,7 @@ examples of how to write tests on your own.
 
 %files examples
 %{_datadir}/avocado/tests
+%{_datadir}/avocado/simpletests
 %{_datadir}/avocado/wrappers
 
 %changelog

diff --git a/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst
@@ -130,13 +130,9 @@ tests.
 Let's now list a directory with a bunch of executable shell
 scripts::
 
-   $ avocado list /usr/share/avocado/examples/wrappers
-    SIMPLE examples/wrappers/dummy.sh
-    SIMPLE examples/wrappers/ltrace.sh
-    SIMPLE examples/wrappers/perf.sh
-    SIMPLE examples/wrappers/strace.sh
-    SIMPLE examples/wrappers/time.sh
-    SIMPLE examples/wrappers/valgrind.sh
+   $ avocado list /usr/share/avocado/simpletests/
+   SIMPLE /usr/share/avocado/simpletests/failtest.sh
+   SIMPLE /usr/share/avocado/simpletests/passtest.sh
 
 Here, as mentioned before, ``SIMPLE`` means that those files are executables
 treated as simple tests. You can also give the ``--verbose`` or ``-V`` flag to

diff --git a/examples/simpletests/failtest.sh b/examples/simpletests/failtest.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+false
+
diff --git a/examples/simpletests/passtest.sh b/examples/simpletests/passtest.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+true
+
diff --git a/setup.py b/setup.py
@@ -75,6 +75,11 @@ def get_data_files():
     data_files += [(get_dir(['usr', 'share', 'avocado', 'wrappers'],
                             ['wrappers']),
                     glob.glob('examples/wrappers/*.sh'))]
+
+    data_files += [(get_dir(['usr', 'share', 'avocado', 'simpletests'],
+                            ['simpletests']),
+                    glob.glob('examples/simpletests/*.sh'))]
+
     data_files.append((get_avocado_libexec_dir(), glob.glob('libexec/*')))
     return data_files