Browse Source

Override SATURNIN_LIBEXEC in build-time tests

Otherwise tests can't pass, especially not on clean machine.
Alois Mahdal 6 years ago
parent
commit
f1cb51c84e
3 changed files with 3 additions and 0 deletions
  1. 1
    0
      packaging/debian/rules
  2. 1
    0
      packaging/template.spec
  3. 1
    0
      tests/TF_HEADER

+ 1
- 0
packaging/debian/rules View File

14
 	make install PREFIX=/usr DESTDIR=TEST
14
 	make install PREFIX=/usr DESTDIR=TEST
15
 	make test \
15
 	make test \
16
 		PATH="$(shell pwd)/TEST/usr/bin:$(PATH)" \
16
 		PATH="$(shell pwd)/TEST/usr/bin:$(PATH)" \
17
+		SATURNIN_LIBEXEC="$(shell pwd)/TEST/usr/libexec/saturnin-demo" \
17
 		SHELLFU_PATH="$(shell pwd)/TEST/usr/share/shellfu/include-bash"
18
 		SHELLFU_PATH="$(shell pwd)/TEST/usr/share/shellfu/include-bash"

+ 1
- 0
packaging/template.spec View File

41
 %check
41
 %check
42
 make test \
42
 make test \
43
     PATH="%{buildroot}/%{_bindir}:$PATH" \
43
     PATH="%{buildroot}/%{_bindir}:$PATH" \
44
+    SATURNIN_LIBEXEC="%{buildroot}/%{_libexecdir}/%{name}" \
44
     SHELLFU_PATH="%{buildroot}/%{sfincb}"
45
     SHELLFU_PATH="%{buildroot}/%{sfincb}"
45
 
46
 
46
 %files
47
 %files

+ 1
- 0
tests/TF_HEADER View File

5
 echo "version: $(saturnin-demo -V)"
5
 echo "version: $(saturnin-demo -V)"
6
 echo "binary: $(which saturnin-demo)"
6
 echo "binary: $(which saturnin-demo)"
7
 echo "SHELLFU_PATH: ${SHELLFU_PATH:-null}"
7
 echo "SHELLFU_PATH: ${SHELLFU_PATH:-null}"
8
+echo "SATURNIN_LIBEXEC: ${SATURNIN_LIBEXEC:-null}"
8
 echo "shellfu-modules:"
9
 echo "shellfu-modules:"
9
 echo "    saturnin_demo_greet: $(shellfu _select_mfile saturnin_demo_greet)"
10
 echo "    saturnin_demo_greet: $(shellfu _select_mfile saturnin_demo_greet)"
10
 echo "saturnin-version: $(saturnin-demo --saturnin-get-saturnin-version)"
11
 echo "saturnin-version: $(saturnin-demo --saturnin-get-saturnin-version)"