[AppTest] Skip model apptests to remove testdata build dependency

This commit skips model apptests in npu-engine, but CI server will
perform this test instead.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/debian/control b/debian/control
index dd57cf2..e6a8abf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: MyungJoo Ham <myungjoo.ham@samsung.com>
 Build-Depends: ninja-build, meson (>=0.50), debhelper (>=9),
  gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5, libgtest-dev, python,
  libdrm-dev, libiniparser-dev, pkg-config, cmake, linux-fvp-headers,
- npu-engine-emul, npu-engine-testdata
+ npu-engine-emul
 Standards-Version: 3.8.2
 Homepage: https://research.samsung.com
 

diff --git a/debian/rules b/debian/rules
index 7c36c0b..1eac5a3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,6 @@
 
 ROOT_DIR:=$(shell pwd)
 export NPU_TRINITY_INSTALL_PREFIX=/opt/trinity
-export NPU_TESTDATA_PATH=${NPU_TRINITY_INSTALL_PREFIX}/share/npu-engine/testdata
-export PATH=$(shell printenv PATH):${NPU_TRINITY_INSTALL_PREFIX}/bin
 export LC_ALL=C.UTF-8
 
 %:
@@ -46,9 +44,6 @@ override_dh_auto_test:
        ./build/tests/apptests/apptest_dmabuf_model
        ./build/tests/apptests/apptest_dmabuf_buffers
        ./build/tests/apptests/apptest_async_callbacks
-       # Test the models
-       ./build/tests/apptests/apptest_example_visa $(NPU_TESTDATA_PATH)/npubinfmt_v1 > /dev/null
-       ./build/tests/apptests/apptest_example_visa $(NPU_TESTDATA_PATH)/npubinfmt_v2 > /dev/null
 
 override_dh_auto_install:
        DESTDIR=$(CURDIR)/debian/tmp ninja -C build install

diff --git a/packaging/npu-engine.spec b/packaging/npu-engine.spec
index 923e3e2..19cfd90 100644 (file)
--- a/packaging/npu-engine.spec
+++ b/packaging/npu-engine.spec
@@ -36,11 +36,6 @@ BuildRequires:  python
 %define enable_npu_emul true
 BuildRequires:  npu-engine-emul
 
-%ifarch x86_64
-%define testdatadir %{_datadir}/npu-engine/testdata
-BuildRequires:  npu-engine-testdata
-%endif
-
 # valgrind requires the same arch with host (x86_64)
 %if 0%{?use_valgrind}
 %ifarch x86_64
@@ -94,6 +89,7 @@ DESTDIR=%{buildroot} ninja install -C build %{?_smp_mflags}
     ./${unittest_exec} --gtest_output="xml:${unittest_exec}.xml"
   %endif
   done
+
   # Run apptests
   find apptests -maxdepth 1 -type f -perm 0755 -print0 | while IFS= read -r -d $'\0' apptest_exec; do
   %if 0%{?use_valgrind}
@@ -103,12 +99,6 @@ DESTDIR=%{buildroot} ninja install -C build %{?_smp_mflags}
   %endif
   done
 
-  # Run apptests using actual model files.
-  %ifarch x86_64
-  ./apptests/apptest_example_visa /%{testdatadir}/npubinfmt_v1 > /dev/null
-  ./apptests/apptest_example_visa /%{testdatadir}/npubinfmt_v2 > /dev/null
-  %endif
-
   popd
 %endif