Browse Source

Split-off jattool-minimal for testing machines

Keep jattool as meta-package for easy installations on workstations.
Alois Mahdal 6 years ago
parent
commit
d5cd8f3dee

+ 14
- 2
packaging/debian/control View File

@@ -9,6 +9,18 @@ Build-Depends:
9 9
 
10 10
 Package: __MKIT_PROJ_PKGNAME__
11 11
 Architecture: all
12
+Depends:
13
+ jattool-minimal (= ${source:Version}),
14
+ jattool-report (= ${source:Version}),
15
+ jattool-tdk (= ${source:Version}),
16
+Description: __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__
17
+ JAT is a testing framework for Shell-based test suites.
18
+ .
19
+ This package is intended for test development workstations and requires
20
+ all other sub-packages.
21
+
22
+Package: __MKIT_PROJ_PKGNAME__-minimal
23
+Architecture: all
12 24
 Depends:
13 25
  shellfu (>= 0.10.7),
14 26
  shellfu (<< 0.11),
@@ -20,8 +32,8 @@ Depends:
20 32
 Description: __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__
21 33
  JAT is a testing framework for Shell-based test suites.
22 34
  .
23
- This sub-package contains main binaries for session control and log
24
- parsing.
35
+ This sub-package contains minimal set of tools, just for test discovery
36
+ and running.
25 37
 
26 38
 Package: __MKIT_PROJ_PKGNAME__-report
27 39
 Architecture: all

+ 9
- 0
packaging/debian/jattool-minimal.install View File

@@ -0,0 +1,9 @@
1
+/etc/bash_completion.d/jattool.bash
2
+/usr/bin/jattool
3
+/usr/libexec/jattool/jattool-qrun
4
+/usr/libexec/jattool/jattool-runtest
5
+/usr/libexec/jattool/jattool-sessid
6
+/usr/libexec/jattool/jattool-sfind
7
+/usr/libexec/jattool/jattool-tfind
8
+/usr/share/jattool/help
9
+/usr/share/jattool/ini.d/main/jattool.ini

+ 0
- 9
packaging/debian/jattool.install View File

@@ -1,10 +1 @@
1
-/etc/bash_completion.d/jattool.bash
2
-/usr/bin/jattool
3
-/usr/libexec/jattool/jattool-qrun
4
-/usr/libexec/jattool/jattool-runtest
5
-/usr/libexec/jattool/jattool-sessid
6
-/usr/libexec/jattool/jattool-sfind
7
-/usr/libexec/jattool/jattool-tfind
8
-/usr/share/jattool/help
9
-/usr/share/jattool/ini.d/main/jattool.ini
10 1
 /usr/share/doc/jattool/README.md

+ 19
- 5
packaging/template.spec View File

@@ -11,21 +11,32 @@ License:    LGPLv2
11 11
 Source0:    %{name}-%{version}.tar.gz
12 12
 BuildArch:  noarch
13 13
 
14
+Requires: jattool-minimal == %{version}
15
+Requires: jattool-report == %{version}
16
+Requires: jattool-tdk == %{version}
17
+%description
18
+JAT is a testing framework for Shell-based test suites.
19
+
20
+This package is intended for test development workstations and requires
21
+all other sub-packages.
22
+
23
+%package minimal
14 24
 Requires: %shellfu_req
15 25
 Requires: %saturnin_req
16 26
 Requires: shellfu-bash
17 27
 Requires: shellfu-bash-jat >= 0.0.0
18 28
 Requires: shellfu-bash-jat < 0.0.1
19 29
 Requires: shellfu-bash-pretty
20
-%description
30
+Summary: JAT harness and test discovery
31
+%description minimal
21 32
 JAT is a testing framework for Shell-based test suites.
22 33
 
23
-This sub-package contains main binaries for test suite and session
24
-control.
34
+This sub-package contains minimal set of tools, just for test discovery and
35
+running.
25 36
 
26 37
 %package report
27 38
 Requires: python2-jinja2
28
-Requires: jattool == %{version}
39
+Requires: jattool-minimal == %{version}
29 40
 Summary: JAT result post-processing
30 41
 %description report
31 42
 JAT is a testing framework for Shell-based test suites.
@@ -51,12 +62,15 @@ make %{?_smp_mflags} PREFIX=/usr
51 62
 %make_install PREFIX=/usr
52 63
 
53 64
 %files
65
+%dir %{_docdir}/%{name}
66
+%doc %{_docdir}/%{name}/README.md
67
+
68
+%files minimal
54 69
 %config %{_sysconfdir}/bash_completion.d/%{name}.bash
55 70
 %dir %{_datadir}/%{name}
56 71
 %dir %{_datadir}/%{name}/ini.d
57 72
 %dir %{_datadir}/%{name}/ini.d/main
58 73
 %dir %{_libexecdir}/%{name}
59
-%doc %{_docdir}/%{name}/README.md
60 74
 %{_bindir}/%{name}
61 75
 %{_datadir}/%{name}/help
62 76
 %{_datadir}/%{name}/ini.d/main/jattool.ini

+ 1
- 1
src/tdk/mkit.ini.skel View File

@@ -14,7 +14,7 @@
14 14
 
15 15
 [macros]
16 16
     __JATTOOL_VERSION__ = __MKIT_PROJ_VERSION__
17
-    __JATS_REQUIRES__ = jattool
17
+    __JATS_REQUIRES__ = jattool-minimal
18 18
     __JATS_REQUIRES__ = shellfu-bash-jat
19 19
     __JATS_REQUIRES__ = shellfu-bash-pretty
20 20