[lxc-devel] [lxc-ci/master] Enable sqlite/dqlite multi-thread support when running unit tests

[freeekanayaka on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 362 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190719/bbf6d21d/attachment.bin>
-------------- next part --------------
From 6747db1d627501a89fc5656733dfe751207421bb Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanayaka at canonical.com>
Date: Fri, 19 Jul 2019 11:51:09 +0200
Subject: [PATCH] Enable sqlite/dqlite multi-thread support when running unit
 tests

Signed-off-by: Free Ekanayaka <free.ekanayaka at canonical.com>
---
 bin/build-lxd | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/build-lxd b/bin/build-lxd
index 8725405..8c52337 100755
--- a/bin/build-lxd
+++ b/bin/build-lxd
@@ -8,7 +8,6 @@ LXD_TESTSUITE=${5:-}
 cleanup() {
     set +e
     echo "==> CLEANUP BEGIN"
-    rm -f /tmp/build-lxd.$$
     if [ -d "${TEST_DIR}/logs" ] && [ -n "${WORKSPACE:-}" ]; then
         sudo tar zcf "${WORKSPACE}/logs.tar.gz" "${TEST_DIR}/logs/"
         sudo chown "$(id -u):$(id -g)" "${WORKSPACE}/logs.tar.gz"
@@ -169,7 +168,7 @@ fi
 # Run the unit tests
 if [ "${LXD_BACKEND}" = "dir" ]; then
     echo "==> UNIT BEGIN: all tests"
-    go test -tags libsqlite3 ./...
+    GO_DQLITE_MULTITHREAD=1 go test -tags libsqlite3 ./...
     echo "==> UNIT DONE: all tests"
 else
     echo "==> Static analysis will be skipped (only run on dir)"
@@ -180,9 +179,7 @@ fi
 cd "test/"
 exec ./main.sh ${LXD_TESTSUITE}
 EOF
-) > /tmp/build-lxd.$$
-
-sudo -E "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}" "LXD_LOGS=${TEST_DIR}/logs" "LXD_VERBOSE=1" "LXD_OFFLINE=1" "LXD_BACKEND=${LXD_BACKEND}" "LXD_CEPH_CLUSTER=ceph" "LXD_CEPH_CEPHFS=persist-cephfs" "PATH=${PATH}"  unshare -m -n -- sh /tmp/build-lxd.$$
+) | sudo -E "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}" "LXD_LOGS=${TEST_DIR}/logs" "LXD_VERBOSE=1" "LXD_OFFLINE=1" "LXD_BACKEND=${LXD_BACKEND}" "LXD_CEPH_CLUSTER=ceph" "LXD_CEPH_CEPHFS=persist-cephfs" "PATH=${PATH}"  unshare -m -n -- sh
 
 
 SUCCESS=1