diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-31 11:57:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:04:28 +0000 |
| commit | a0842e8b20cbe1ed717b72775428d1f8fc047fa4 (patch) | |
| tree | b86d0614a477f7e092d626d59b888d085aaca400 /nixpkgs/pkgs/development/libraries/umockdev | |
| parent | c36b32d476b520ed0d2a37cd0973f98583d6dc7c (diff) | |
| parent | 8d1510abfb592339e13ce8f6db6f29c1f8b72924 (diff) | |
| download | nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.gz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.bz2 nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.lz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.xz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.zst nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.zip | |
Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/umockdev')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/umockdev/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/umockdev/disable-failed-test.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 866dc48f2704..6a2285563064 100644 --- a/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-test-paths.patch + # https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461 + ./disable-failed-test.patch # https://github.com/martinpitt/umockdev/pull/93 (fetchpatch { url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch"; diff --git a/nixpkgs/pkgs/development/libraries/umockdev/disable-failed-test.patch b/nixpkgs/pkgs/development/libraries/umockdev/disable-failed-test.patch new file mode 100644 index 000000000000..69e74dd38b8d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/umockdev/disable-failed-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test-umockdev-vala.vala b/tests/test-umockdev-vala.vala +index 8b104b2..d9889b8 100644 +--- a/tests/test-umockdev-vala.vala ++++ b/tests/test-umockdev-vala.vala +@@ -668,7 +668,7 @@ main (string[] args) + + /* tests for mocking ioctls */ + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_static", t_usbfs_ioctl_static); +- Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); ++ /* Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree", t_usbfs_ioctl_tree); */ + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_with_default_device", t_usbfs_ioctl_tree_with_default_device); + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_override_default_device", t_usbfs_ioctl_tree_override_default_device); + Test.add_func ("/umockdev-testbed-vala/usbfs_ioctl_tree_xz", t_usbfs_ioctl_tree_xz); |