瀏覽代碼

Override SATURNIN_LIBEXEC in build-time tests

Otherwise tests can't pass, especially not on clean machine.
Alois Mahdal 6 年之前
父節點
當前提交
f1cb51c84e
共有 3 個檔案被更改,包括 3 行新增0 行删除
  1. 1
    0
      packaging/debian/rules
  2. 1
    0
      packaging/template.spec
  3. 1
    0
      tests/TF_HEADER

+ 1
- 0
packaging/debian/rules 查看文件

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

+ 1
- 0
packaging/template.spec 查看文件

@@ -41,6 +41,7 @@ make %{?_smp_mflags} PREFIX=/usr
41 41
 %check
42 42
 make test \
43 43
     PATH="%{buildroot}/%{_bindir}:$PATH" \
44
+    SATURNIN_LIBEXEC="%{buildroot}/%{_libexecdir}/%{name}" \
44 45
     SHELLFU_PATH="%{buildroot}/%{sfincb}"
45 46
 
46 47
 %files

+ 1
- 0
tests/TF_HEADER 查看文件

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