From 34af4a22f24538d0fc7915497773b6dc56aca6e5 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Fri, 18 Dec 2015 11:03:54 +0100 Subject: [PATCH] Get rid of tpkg help files The fewer files to maintain the better --- src/test/tpkg/050-constants.tpkg/050-constants.dsc | 2 +- src/test/tpkg/050-constants.tpkg/050-constants.help | 1 - src/test/tpkg/060-symbols.tpkg/060-symbols.dsc | 2 +- src/test/tpkg/060-symbols.tpkg/060-symbols.help | 1 - src/test/tpkg/100-compile.tpkg/100-compile.dsc | 2 +- src/test/tpkg/100-compile.tpkg/100-compile.help | 1 - src/test/tpkg/100-compile.tpkg/100-compile.pre | 2 +- src/test/tpkg/110-link.tpkg/110-link.dsc | 2 +- src/test/tpkg/110-link.tpkg/110-link.help | 1 - .../tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.dsc | 2 +- .../tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.help | 1 - src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.dsc | 2 +- src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.help | 1 - .../tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc | 2 +- .../tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.help | 1 - src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.dsc | 2 +- src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.help | 1 - .../220-stub-only-run-getdns_query.dsc | 2 +- .../220-stub-only-run-getdns_query.help | 1 - .../230-stub-only-run-unit-tests.dsc | 2 +- .../230-stub-only-run-unit-tests.help | 1 - src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.dsc | 2 +- src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.help | 2 -- .../300-event-loops-compile.tpkg/300-event-loops-compile.dsc | 2 +- .../300-event-loops-compile.tpkg/300-event-loops-compile.help | 1 - .../330-event-loops-unit-tests.dsc | 2 +- .../330-event-loops-unit-tests.help | 1 - 27 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 src/test/tpkg/050-constants.tpkg/050-constants.help delete mode 100644 src/test/tpkg/060-symbols.tpkg/060-symbols.help delete mode 100644 src/test/tpkg/100-compile.tpkg/100-compile.help delete mode 100644 src/test/tpkg/110-link.tpkg/110-link.help delete mode 100644 src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.help delete mode 100644 src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.help delete mode 100644 src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.help delete mode 100644 src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.help delete mode 100644 src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.help delete mode 100644 src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.help delete mode 100644 src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.help delete mode 100644 src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.help delete mode 100644 src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.help diff --git a/src/test/tpkg/050-constants.tpkg/050-constants.dsc b/src/test/tpkg/050-constants.tpkg/050-constants.dsc index b746f673..5cb0151f 100644 --- a/src/test/tpkg/050-constants.tpkg/050-constants.dsc +++ b/src/test/tpkg/050-constants.tpkg/050-constants.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: -Help: 050-constants.help +Help: Pre: 050-constants.pre Post: Test: 050-constants.test diff --git a/src/test/tpkg/050-constants.tpkg/050-constants.help b/src/test/tpkg/050-constants.tpkg/050-constants.help deleted file mode 100644 index f5bb9477..00000000 --- a/src/test/tpkg/050-constants.tpkg/050-constants.help +++ /dev/null @@ -1 +0,0 @@ -Are all constants in const-info.c diff --git a/src/test/tpkg/060-symbols.tpkg/060-symbols.dsc b/src/test/tpkg/060-symbols.tpkg/060-symbols.dsc index 77b7a104..3e51a88c 100644 --- a/src/test/tpkg/060-symbols.tpkg/060-symbols.dsc +++ b/src/test/tpkg/060-symbols.tpkg/060-symbols.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: -Help: 060-symbols.help +Help: Pre: 060-symbols.pre Post: Test: 060-symbols.test diff --git a/src/test/tpkg/060-symbols.tpkg/060-symbols.help b/src/test/tpkg/060-symbols.tpkg/060-symbols.help deleted file mode 100644 index 67ec7770..00000000 --- a/src/test/tpkg/060-symbols.tpkg/060-symbols.help +++ /dev/null @@ -1 +0,0 @@ -Are all symbols are in libgetdns.symbols diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.dsc b/src/test/tpkg/100-compile.tpkg/100-compile.dsc index 7bd90bd4..e39ac6a7 100644 --- a/src/test/tpkg/100-compile.tpkg/100-compile.dsc +++ b/src/test/tpkg/100-compile.tpkg/100-compile.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: -Help: 100-compile.help +Help: Pre: 100-compile.pre Post: Test: 100-compile.test diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.help b/src/test/tpkg/100-compile.tpkg/100-compile.help deleted file mode 100644 index 535bbaca..00000000 --- a/src/test/tpkg/100-compile.tpkg/100-compile.help +++ /dev/null @@ -1 +0,0 @@ -The library is compiled without eventloop extensions. diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.pre b/src/test/tpkg/100-compile.tpkg/100-compile.pre index 1c71f4c7..a0272ed3 100644 --- a/src/test/tpkg/100-compile.tpkg/100-compile.pre +++ b/src/test/tpkg/100-compile.tpkg/100-compile.pre @@ -16,4 +16,4 @@ fi rm -fr "${BUILDDIR}/build" mkdir "${BUILDDIR}/build" cd "${BUILDDIR}/build" -"${SRCROOT}/configure" +"${SRCROOT}/configure" --prefix "${BUILDDIR}/install" diff --git a/src/test/tpkg/110-link.tpkg/110-link.dsc b/src/test/tpkg/110-link.tpkg/110-link.dsc index b10cf7b2..7c525d9d 100644 --- a/src/test/tpkg/110-link.tpkg/110-link.dsc +++ b/src/test/tpkg/110-link.tpkg/110-link.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 100-compile.tpkg -Help: 110-link.help +Help: Pre: Post: Test: 110-link.test diff --git a/src/test/tpkg/110-link.tpkg/110-link.help b/src/test/tpkg/110-link.tpkg/110-link.help deleted file mode 100644 index 36ba881b..00000000 --- a/src/test/tpkg/110-link.tpkg/110-link.help +++ /dev/null @@ -1 +0,0 @@ -Try to link the getdns_query program diff --git a/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.dsc b/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.dsc index a76ecfd2..55f17b68 100644 --- a/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.dsc +++ b/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 110-link.tpkg -Help: 120-run-getdns_query.help +Help: Pre: Post: Test: 120-run-getdns_query.test diff --git a/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.help b/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.help deleted file mode 100644 index b86b07f0..00000000 --- a/src/test/tpkg/120-run-getdns_query.tpkg/120-run-getdns_query.help +++ /dev/null @@ -1 +0,0 @@ -Run the getdns_query test program diff --git a/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.dsc b/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.dsc index 5e97843a..3184c4d5 100644 --- a/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.dsc +++ b/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 110-link.tpkg -Help: 130-run-unit-tests.help +Help: Pre: Post: Test: 130-run-unit-tests.test diff --git a/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.help b/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.help deleted file mode 100644 index b86b07f0..00000000 --- a/src/test/tpkg/130-run-unit-tests.tpkg/130-run-unit-tests.help +++ /dev/null @@ -1 +0,0 @@ -Run the getdns_query test program diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc index e690db4b..bf36b6e6 100644 --- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc +++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: -Help: 200-stub-only-compile.help +Help: Pre: 200-stub-only-compile.pre Post: Test: 200-stub-only-compile.test diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.help b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.help deleted file mode 100644 index 35b616f0..00000000 --- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.help +++ /dev/null @@ -1 +0,0 @@ -The library is compiled as stub only and without eventloop extensions. diff --git a/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.dsc b/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.dsc index 6a6cb61e..4ad88d78 100644 --- a/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.dsc +++ b/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 200-stub-only-compile.tpkg -Help: 210-stub-only-link.help +Help: Pre: Post: Test: 210-stub-only-link.test diff --git a/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.help b/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.help deleted file mode 100644 index 36ba881b..00000000 --- a/src/test/tpkg/210-stub-only-link.tpkg/210-stub-only-link.help +++ /dev/null @@ -1 +0,0 @@ -Try to link the getdns_query program diff --git a/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.dsc b/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.dsc index 159de209..88f24543 100644 --- a/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.dsc +++ b/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 210-stub-only-link.tpkg -Help: 220-stub-only-run-getdns_query.help +Help: Pre: Post: Test: 220-stub-only-run-getdns_query.test diff --git a/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.help b/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.help deleted file mode 100644 index b86b07f0..00000000 --- a/src/test/tpkg/220-stub-only-run-getdns_query.tpkg/220-stub-only-run-getdns_query.help +++ /dev/null @@ -1 +0,0 @@ -Run the getdns_query test program diff --git a/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.dsc b/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.dsc index 2fa8ed12..633b997b 100644 --- a/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.dsc +++ b/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 210-stub-only-link.tpkg -Help: 230-stub-only-run-unit-tests.help +Help: Pre: Post: Test: 230-stub-only-run-unit-tests.test diff --git a/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.help b/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.help deleted file mode 100644 index b86b07f0..00000000 --- a/src/test/tpkg/230-stub-only-run-unit-tests.tpkg/230-stub-only-run-unit-tests.help +++ /dev/null @@ -1 +0,0 @@ -Run the getdns_query test program diff --git a/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.dsc b/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.dsc index 0b3ab66a..683876b9 100644 --- a/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.dsc +++ b/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 200-stub-only-compile.tpkg -Help: 250-json-pointers.help +Help: Pre: 250-json-pointers.pre Post: Test: 250-json-pointers.test diff --git a/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.help b/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.help deleted file mode 100644 index d9deefa2..00000000 --- a/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.help +++ /dev/null @@ -1,2 +0,0 @@ -Compile a program that setups a dict with json pointers and pretty prints the dict. -Then compare the output to the known to be good output. diff --git a/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.dsc b/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.dsc index a94ef7a8..d1fa5240 100644 --- a/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.dsc +++ b/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: -Help: 300-event-loops-compile.help +Help: Pre: 300-event-loops-compile.pre Post: Test: 300-event-loops-compile.test diff --git a/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.help b/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.help deleted file mode 100644 index ad31b011..00000000 --- a/src/test/tpkg/300-event-loops-compile.tpkg/300-event-loops-compile.help +++ /dev/null @@ -1 +0,0 @@ -The library is compiled with eventloop extensions for all event loops available. diff --git a/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.dsc b/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.dsc index 0ae2a358..eb738511 100644 --- a/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.dsc +++ b/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.dsc @@ -7,7 +7,7 @@ Category: Component: CmdDepends: Depends: 300-event-loops-compile.tpkg -Help: 330-event-loops-unit-tests.help +Help: Pre: Post: Test: 330-event-loops-unit-tests.test diff --git a/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.help b/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.help deleted file mode 100644 index b86b07f0..00000000 --- a/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.help +++ /dev/null @@ -1 +0,0 @@ -Run the getdns_query test program