On Fri, 01 Feb 2019, Bruno Santos <brunomanuelsantos@xxxxxxxxxxxxxxxxxx> wrote:
Provide a more natural organization of the test cases by calling things
by what they are.
---
doc/examples.rst | 16 ++++++++--------
doc/update-examples | 2 +-
...doc-basic.stdout => compat-javadoc-basic.rst} | 0
...liberal.stdout => compat-javadoc-liberal.rst} | 0
...t-kernel-doc.stdout => compat-kernel-doc.rst} | 0
test/{compat.stdout => compat.rst} | 0
test/{composition.stdout => composition.rst} | 0
test/{doc.stdout => doc.rst} | 0
test/{enum.stdout => enum.rst} | 0
...mple-10-macro.stdout => example-10-macro.rst} | 0
...0-variable.stdout => example-20-variable.rst} | 0
...-30-typedef.stdout => example-30-typedef.rst} | 0
...xample-40-enum.stdout => example-40-enum.rst} | 0
...le-50-struct.stdout => example-50-struct.rst} | 0
...0-function.stdout => example-70-function.rst} | 0
...le-80-compat.stdout => example-80-compat.rst} | 0
...-90-generic.stdout => example-90-generic.rst} | 0
...like-macro.stdout => function-like-macro.rst} | 0
test/{function.stdout => function.rst} | 0
...-failure.stdout => meta-expected-failure.rst} | 0
test/{simple-macro.stdout => simple-macro.rst} | 0
test/{struct.stdout => struct.rst} | 0
test/test_cautodoc.py | 2 +-
test/test_hawkmoth.py | 2 +-
test/{typedef-enum.stdout => typedef-enum.rst} | 0
...{typedef-struct.stdout => typedef-struct.rst} | 0
test/{typedef.stdout => typedef.rst} | 0
test/{union.stdout => union.rst} | 0
test/{variable.stdout => variable.rst} | 0
29 files changed, 11 insertions(+), 11 deletions(-)
rename test/{compat-javadoc-basic.stdout => compat-javadoc-basic.rst} (100%)
rename test/{compat-javadoc-liberal.stdout => compat-javadoc-liberal.rst}
(100%)
rename test/{compat-kernel-doc.stdout => compat-kernel-doc.rst} (100%)
rename test/{compat.stdout => compat.rst} (100%)
rename test/{composition.stdout => composition.rst} (100%)
rename test/{doc.stdout => doc.rst} (100%)
rename test/{enum.stdout => enum.rst} (100%)
rename test/{example-10-macro.stdout => example-10-macro.rst} (100%)
rename test/{example-20-variable.stdout => example-20-variable.rst} (100%)
rename test/{example-30-typedef.stdout => example-30-typedef.rst} (100%)
rename test/{example-40-enum.stdout => example-40-enum.rst} (100%)
rename test/{example-50-struct.stdout => example-50-struct.rst} (100%)
rename test/{example-70-function.stdout => example-70-function.rst} (100%)
rename test/{example-80-compat.stdout => example-80-compat.rst} (100%)
rename test/{example-90-generic.stdout => example-90-generic.rst} (100%)
rename test/{function-like-macro.stdout => function-like-macro.rst} (100%)
rename test/{function.stdout => function.rst} (100%)
rename test/{meta-expected-failure.stdout => meta-expected-failure.rst}
(100%)
rename test/{simple-macro.stdout => simple-macro.rst} (100%)
rename test/{struct.stdout => struct.rst} (100%)
rename test/{typedef-enum.stdout => typedef-enum.rst} (100%)
rename test/{typedef-struct.stdout => typedef-struct.rst} (100%)
rename test/{typedef.stdout => typedef.rst} (100%)
rename test/{union.stdout => union.rst} (100%)
rename test/{variable.stdout => variable.rst} (100%)
diff --git a/doc/examples.rst b/doc/examples.rst
index 755a3bf..3a4dea3 100644
--- a/doc/examples.rst
+++ b/doc/examples.rst
@@ -44,7 +44,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-10-macro.stdout
+ .. include:: examples/example-10-macro.rst
Variable
--------
@@ -71,7 +71,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-20-variable.stdout
+ .. include:: examples/example-20-variable.rst
Typedef
-------
@@ -98,7 +98,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-30-typedef.stdout
+ .. include:: examples/example-30-typedef.rst
Enum
----
@@ -125,7 +125,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-40-enum.stdout
+ .. include:: examples/example-40-enum.rst
Struct
------
@@ -152,7 +152,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-50-struct.stdout
+ .. include:: examples/example-50-struct.rst
Function
--------
@@ -179,7 +179,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-70-function.stdout
+ .. include:: examples/example-70-function.rst
Compat
------
@@ -206,7 +206,7 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-80-compat.stdout
+ .. include:: examples/example-80-compat.rst
Generic
-------
@@ -233,5 +233,5 @@ Output
.. only:: not have_hawkmoth
- .. include:: examples/example-90-generic.stdout
+ .. include:: examples/example-90-generic.rst
diff --git a/doc/update-examples b/doc/update-examples
index 9f0c50d..414a227 100755
--- a/doc/update-examples
+++ b/doc/update-examples
@@ -38,7 +38,7 @@ read_options()
for f in $(find "$TESTDIR" -maxdepth 1 -name "example-*.c" | sort); do
options=$(read_options ${f/.c/.options})
input=examples/$(basename $f)
- static_output=${input/.c/.stdout}
+ static_output=${input/.c/.rst}
title=$(basename $f .c)
title=${title#example-}
title=${title#[0-9][0-9]-}
diff --git a/test/compat-javadoc-basic.stdout b/test/compat-javadoc-basic.rst
similarity index 100%
rename from test/compat-javadoc-basic.stdout
rename to test/compat-javadoc-basic.rst
diff --git a/test/compat-javadoc-liberal.stdout
b/test/compat-javadoc-liberal.rst
similarity index 100%
rename from test/compat-javadoc-liberal.stdout
rename to test/compat-javadoc-liberal.rst
diff --git a/test/compat-kernel-doc.stdout b/test/compat-kernel-doc.rst
similarity index 100%
rename from test/compat-kernel-doc.stdout
rename to test/compat-kernel-doc.rst
diff --git a/test/compat.stdout b/test/compat.rst
similarity index 100%
rename from test/compat.stdout
rename to test/compat.rst
diff --git a/test/composition.stdout b/test/composition.rst
similarity index 100%
rename from test/composition.stdout
rename to test/composition.rst
diff --git a/test/doc.stdout b/test/doc.rst
similarity index 100%
rename from test/doc.stdout
rename to test/doc.rst
diff --git a/test/enum.stdout b/test/enum.rst
similarity index 100%
rename from test/enum.stdout
rename to test/enum.rst
diff --git a/test/example-10-macro.stdout b/test/example-10-macro.rst
similarity index 100%
rename from test/example-10-macro.stdout
rename to test/example-10-macro.rst
diff --git a/test/example-20-variable.stdout b/test/example-20-variable.rst
similarity index 100%
rename from test/example-20-variable.stdout
rename to test/example-20-variable.rst
diff --git a/test/example-30-typedef.stdout b/test/example-30-typedef.rst
similarity index 100%
rename from test/example-30-typedef.stdout
rename to test/example-30-typedef.rst
diff --git a/test/example-40-enum.stdout b/test/example-40-enum.rst
similarity index 100%
rename from test/example-40-enum.stdout
rename to test/example-40-enum.rst
diff --git a/test/example-50-struct.stdout b/test/example-50-struct.rst
similarity index 100%
rename from test/example-50-struct.stdout
rename to test/example-50-struct.rst
diff --git a/test/example-70-function.stdout b/test/example-70-function.rst
similarity index 100%
rename from test/example-70-function.stdout
rename to test/example-70-function.rst
diff --git a/test/example-80-compat.stdout b/test/example-80-compat.rst
similarity index 100%
rename from test/example-80-compat.stdout
rename to test/example-80-compat.rst
diff --git a/test/example-90-generic.stdout b/test/example-90-generic.rst
similarity index 100%
rename from test/example-90-generic.stdout
rename to test/example-90-generic.rst
diff --git a/test/function-like-macro.stdout b/test/function-like-macro.rst
similarity index 100%
rename from test/function-like-macro.stdout
rename to test/function-like-macro.rst
diff --git a/test/function.stdout b/test/function.rst
similarity index 100%
rename from test/function.stdout
rename to test/function.rst
diff --git a/test/meta-expected-failure.stdout
b/test/meta-expected-failure.rst
similarity index 100%
rename from test/meta-expected-failure.stdout
rename to test/meta-expected-failure.rst
diff --git a/test/simple-macro.stdout b/test/simple-macro.rst
similarity index 100%
rename from test/simple-macro.stdout
rename to test/simple-macro.rst
diff --git a/test/struct.stdout b/test/struct.rst
similarity index 100%
rename from test/struct.stdout
rename to test/struct.rst
diff --git a/test/test_cautodoc.py b/test/test_cautodoc.py
index 0a8e5bb..a1aff01 100755
--- a/test/test_cautodoc.py
+++ b/test/test_cautodoc.py
@@ -27,7 +27,7 @@ def _get_output(input_filename, app, status, warning,
**options):
@with_app(confdir=testenv.testdir, create_new_srcdir=True,
buildername='text')
def _get_expected(input_filename, app, status, warning, **options):
- shutil.copyfile(testenv.modify_filename(input_filename, ext='stdout'),
+ shutil.copyfile(testenv.modify_filename(input_filename, ext='rst'),
os.path.join(app.srcdir, 'index.rst'))
app.build()
diff --git a/test/test_hawkmoth.py b/test/test_hawkmoth.py
index 75eebbe..8d2b02b 100755
--- a/test/test_hawkmoth.py
+++ b/test/test_hawkmoth.py
@@ -12,7 +12,7 @@ def _get_output(input_filename, **options):
return hawkmoth.parse_to_string(input_filename, False, **options)
def _get_expected(input_filename, **options):
- return testenv.read_file(input_filename, ext='stdout')
+ return testenv.read_file(input_filename, ext='rst')
class ParserTest(unittest.TestCase):
pass
diff --git a/test/typedef-enum.stdout b/test/typedef-enum.rst
similarity index 100%
rename from test/typedef-enum.stdout
rename to test/typedef-enum.rst
diff --git a/test/typedef-struct.stdout b/test/typedef-struct.rst
similarity index 100%
rename from test/typedef-struct.stdout
rename to test/typedef-struct.rst
diff --git a/test/typedef.stdout b/test/typedef.rst
similarity index 100%
rename from test/typedef.stdout
rename to test/typedef.rst
diff --git a/test/union.stdout b/test/union.rst
similarity index 100%
rename from test/union.stdout
rename to test/union.rst
diff --git a/test/variable.stdout b/test/variable.rst
similarity index 100%
rename from test/variable.stdout
rename to test/variable.rst
--
2.20.1
