Merge pull request #34 from mathstuf/port-libkeyutils-tests

Port libkeyutils tests

Author: mathstuf

.ci/tarpaulin.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+readonly version="0.10.0"
+readonly sha256sum="6843be8384bf14385b36a3118efc1ed2d25d531acb8df954cd3f93d44018b09e"
+readonly filename="cargo-tarpaulin-$version-travis"
+readonly tarball="$filename.tar.gz"
+
+cd .ci
+
+echo "$sha256sum  $tarball" > tarpaulin.sha256sum
+curl -OL "https://github.com/xd009642/tarpaulin/releases/download/$version/$tarball"
+sha256sum --check tarpaulin.sha256sum
+tar xf "$tarball"

.cirrus.yml

@@ -19,7 +19,7 @@ rustfmt_task:
 linux_task:
     matrix:
     - container:
-        image: rust:1.34.0
+        image: rust:1.35.0
     - container:
         image: rust:latest
     - allow_failures: true
@@ -31,7 +31,7 @@ linux_task:
         folder: $CARGO_HOME/registry
         fingerprint_script: cat Cargo.lock
     build_script: cargo build
-    test_script: cargo test
+    test_script: cargo test -- --test-threads 1
     before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 minimal_version_task:
@@ -52,13 +52,13 @@ coverage_task:
         CODECOV_TOKEN: ENCRYPTED[1e221ef78a37c960613ff80db7141f3158e3218031934395466f4720f450b7acfd74e587819435ce9be0b13fa1b68f1b]
     keyutils_script: apt-get update && apt-get install libkeyutils-dev
     tarpaulin_cache:
-        folder: $CARGO_HOME/bin
-        populate_script: cargo install --version 0.8.7 cargo-tarpaulin
-        fingerprint_script: cargo install --list
+        folder: .ci
+        populate_script: .ci/tarpaulin.sh
+        fingerprint_script: cat .ci/tarpaulin.sh
     lockfile_script: cargo generate-lockfile
     cargo_cache:
         folder: $CARGO_HOME/registry
         fingerprint_script: cat Cargo.lock
-    coverage_script: cargo tarpaulin --out Xml
+    coverage_script: PATH=$PATH:$PWD/.ci cargo tarpaulin --out Xml
     upload_script: bash <(curl -s https://codecov.io/bash) -X gcov
     before_cache_script: rm -rf $CARGO_HOME/registry/index

Cargo.toml

@@ -16,6 +16,9 @@ members = ["keyutils-raw"]
 [dev-dependencies]
 lazy_static = "1"
 regex = "1"
+serial_test = "*"
+serial_test_derive = "*"
+semver = "*"
 
 [dependencies]
 bitflags = "1.0.4"

keyutils-raw/src/functions.rs

@@ -89,7 +89,7 @@ extern "C" {
         ringid:         KeyringSerial,
         type_:          *const libc::c_char,
         description:    *const libc::c_char,
-        destringid:     KeyringSerial)
+        destringid:     Option<KeyringSerial>)
         -> libc::c_long;
     pub fn keyctl_read(
         id:     KeyringSerial,
@@ -100,12 +100,12 @@ extern "C" {
         id:         KeyringSerial,
         payload:    *const libc::c_void,
         plen:       libc::size_t,
-        ringid:     KeyringSerial)
+        ringid:     Option<KeyringSerial>)
         -> libc::c_long;
     pub fn keyctl_negate(
         id:         KeyringSerial,
         timeout:    TimeoutSeconds,
-        ringid:     KeyringSerial)
+        ringid:     Option<KeyringSerial>)
         -> libc::c_long;
     pub fn keyctl_set_reqkey_keyring(
         reqkey_defl:    libc::c_int)
@@ -128,7 +128,7 @@ extern "C" {
         id:         KeyringSerial,
         timeout:    TimeoutSeconds,
         error:      libc::c_uint,
-        ringid:     KeyringSerial)
+        ringid:     Option<KeyringSerial>)
         -> libc::c_long;
     pub fn keyctl_invalidate(
         id: KeyringSerial)