Browse Source

Do not override SATURNIN_CONF_PATH

Tests are supposed to set it on their own and not rely on environment.
Hence it's not even interesting to have in TF_HEADER.
Alois Mahdal 6 years ago
parent
commit
532bf95be5
3 changed files with 2 additions and 5 deletions
  1. 1
    2
      packaging/debian/rules
  2. 1
    2
      packaging/template.spec
  3. 0
    1
      tests/TF_HEADER

+ 1
- 2
packaging/debian/rules View File

@@ -13,5 +13,4 @@ override_dh_auto_test:
13 13
 	make clean
14 14
 	make install PREFIX=/usr DESTDIR=TEST
15 15
 	make test \
16
-		PATH="$(shell pwd)/TEST/usr/bin:$(PATH)" \
17
-		SATURNIN_CONF_PATH="$(shell pwd)/TEST/usr/share/bmo/ini.d"
16
+		PATH="$(shell pwd)/TEST/usr/bin:$(PATH)"

+ 1
- 2
packaging/template.spec View File

@@ -32,8 +32,7 @@ make %{?_smp_mflags} PREFIX=/usr
32 32
 
33 33
 %check
34 34
 make test \
35
-    PATH="%{buildroot}/%{_bindir}:$PATH" \
36
-    SATURNIN_CONF_PATH="%{buildroot}/%{_datadir}/%{name}/ini.d"
35
+    PATH="%{buildroot}/%{_bindir}:$PATH"
37 36
 
38 37
 %files
39 38
 %config %{_sysconfdir}/bash_completion.d/%{name}.bash

+ 0
- 1
tests/TF_HEADER View File

@@ -5,4 +5,3 @@
5 5
 echo "version: $(saturnin-demo -V)"
6 6
 echo "binary: $(which saturnin-demo)"
7 7
 echo "saturnin-version: $(saturnin-demo --saturnin-get-saturnin-version)"
8
-echo "saturnin-conf-path: $(saturnin-demo --saturnin-get-saturnin-conf-path)"