Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan / 
vulkan-loader


Commits:
5fb5ef9f by Timo Aaltonen at 2019-03-12T16:32:03Z
rules: Enable tests, but expect most of them to fail since there's no 
software driver yet.

- - - - -
1621d53f by Timo Aaltonen at 2019-03-12T16:35:15Z
control, rules: Drop quilt from build-depends/dh since this is a format 3.0 pkg.

- - - - -
b2f52e8d by Timo Aaltonen at 2019-03-12T16:38:19Z
rules: Update the clean target.

- - - - -
38af2d1c by Timo Aaltonen at 2019-03-12T16:39:35Z
release to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+vulkan-loader (1.1.101.0-2) unstable; urgency=medium
+
+  * rules: Enable tests, but expect most of them to fail since there's
+    no software driver yet.
+  * control, rules: Drop quilt from build-depends/dh since this is a
+    format 3.0 pkg.
+  * rules: Update the clean target.
+
+ -- Timo Aaltonen <[email protected]>  Tue, 12 Mar 2019 18:38:57 +0200
+
 vulkan-loader (1.1.101.0-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -4,13 +4,13 @@ Maintainer: Debian X Strike Force <[email protected]>
 Uploaders: Timo Aaltonen <[email protected]>
 Build-Depends: debhelper (>= 11),
  cmake,
+ googletest,
  libwayland-dev,
  libx11-dev,
  libxcb1-dev,
  libxrandr-dev,
  pkg-config,
  python3,
- quilt,
 Standards-Version: 4.2.0
 Section: libs
 Homepage: https://github.com/KhronosGroup/Vulkan-Loader


=====================================
debian/rules
=====================================
@@ -6,23 +6,30 @@ include /usr/share/dpkg/default.mk
 include /usr/share/dpkg/pkg-info.mk
 
 %:
-       dh $@ --with quilt --builddirectory=build/
+       dh $@ --builddirectory=build/
 
 override_dh_clean:
        dh_clean
        rm -rf __pycache__ \
                include \
-               scripts/__pycache__
+               scripts/__pycache__ \
+               vulkan-headers/registry/__pycache__
+       rm -f external/googletest
 
 override_dh_auto_configure:
+       ln -s /usr/src/googletest external
+
        dh_auto_configure -- \
        -DCMAKE_BUILD_TYPE=Release \
        -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
-       -DBUILD_TESTS=OFF \
        -DBUILD_WSI_MIR_SUPPORT=OFF \
        -DVulkanHeaders_INCLUDE_DIR=../vulkan-headers/include \
        -DVulkanRegistry_DIR=../vulkan-headers/registry
 
+override_dh_auto_test:
+       (cd build; tests/run_all_tests.sh || \
+               echo "NOTE: 23 tests expected to fail without a vulkan driver")
+
 override_dh_auto_install:
        dh_auto_install --destdir=debian/tmp
 



View it on GitLab: 
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/compare/b9cd9d9a34dab1d2895b2ea89f47749b5fce5e92...38af2d1c8f3e5fb4631a60bf0da80fbdb1b09c31

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/vulkan/vulkan-loader/compare/b9cd9d9a34dab1d2895b2ea89f47749b5fce5e92...38af2d1c8f3e5fb4631a60bf0da80fbdb1b09c31
You're receiving this email because of your account on salsa.debian.org.

Reply via email to