Fix Merge Issue

.travis.yml

@@ -1,169 +1,26 @@
-# Generated by scripts/generate_travis_yml.py
-
 dist: bionic
 
-jobs:
-  include:
-    - language: python
-      python: 3.8
-      addons:
-        apt:
-          packages:
-            - libbz2-dev
-            - liblzma-dev
-            - zlib1g-dev
-      install:
-      script: python setup.py build -j "$(nproc)" test
-    - language: python
-      python: 3.7
-      addons:
-        apt:
-          packages:
-            - libbz2-dev
-            - liblzma-dev
-            - zlib1g-dev
-      install:
-      script: python setup.py build -j "$(nproc)" test
-    - language: python
-      python: 3.6
-      addons:
-        apt:
-          packages:
-            - libbz2-dev
-            - liblzma-dev
-            - zlib1g-dev
-      install:
-      script: python setup.py build -j "$(nproc)" test
-    - name: "vmtest Linux 5.6"
-      language: minimal
-      env: KERNEL=5.6
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
-    - name: "vmtest Linux 5.5"
-      language: minimal
-      env: KERNEL=5.5
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
-    - name: "vmtest Linux 5.4"
-      language: minimal
-      env: KERNEL=5.4
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
-    - name: "vmtest Linux 4.19"
-      language: minimal
-      env: KERNEL=4.19
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
-    - name: "vmtest Linux 4.14"
-      language: minimal
-      env: KERNEL=4.14
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
-    - name: "vmtest Linux 4.9"
-      language: minimal
-      env: KERNEL=4.9
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
-    - name: "vmtest Linux 4.4"
-      language: minimal
-      env: KERNEL=4.4
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-setuptools
-            - qemu-kvm
-            - rsync
-            - zstd
-      install: sudo adduser "$USER" kvm
-      before_script:
-        # The double sudo is necessary to pick up the new group membership.
-        - sudo -E sudo -E -u "$USER" scripts/vmtest/run.sh -k "$KERNEL"'.*' -o -d ~ ~/root.img; exitstatus=$?
-        # Exit status 0 is success, 1 is test failure (should fail in the script
-        # step), anything else is an error (should fail here).
-        - test $exitstatus -le 1
-      script: test $exitstatus -eq 0
+language: python
+python:
+  - '3.8'
+  - '3.7'
+  - '3.6'
+install:
+  # Upstream defaults to world-read-writeable /dev/kvm. Debian/Ubuntu override
+  # this; see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892945. We want
+  # the upstream default.
+  - sudo echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /lib/udev/rules.d/99-fix-kvm.rules > /dev/null
+  - sudo udevadm control --reload-rules
+  # On systemd >= 238 we can use udevadm trigger -w and remove udevadm settle.
+  - sudo udevadm trigger /dev/kvm
+  - sudo udevadm settle
+script: python setup.py test -K
+
+addons:
+  apt:
+    packages:
+      - libbz2-dev
+      - liblzma-dev
+      - qemu-kvm
+      - zlib1g-dev
+      - zstd

MANIFEST.in

@@ -1,3 +1,3 @@
 recursive-include docs *.py *.rst
 recursive-include tests *.py
-recursive-include scripts/vmtest *.py *.rst *.sh
+recursive-include vmtest *.py *.rst *.sh

debian/rules

@@ -2,3 +2,17 @@
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+	#
+	# Don't run drgn's tests during the build step; The repo comes
+	# with its own testing that takes place elsewhere ->
+	# https://travis-ci.org/github/delphix/drgn/branches
+	#
+	# Ideally it wouldn't hurt having them run here too but due to
+	# drgn's testing setup, we'd have to override pybuild's default
+	# behavior. Since drgn is not a project that is owned by us,
+	# disabling tests here makes even more sense as we won't have
+	# to adjust the setup here every time a change in the test
+	# framework of drgn is applied upstream.
+	#