[lxc-devel] [lxcfs/master] Bugfixes

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 302 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200305/58880e45/attachment.bin>
-------------- next part --------------
From c19839975a642087fb0799dc4fea1111f3244b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 5 Mar 2020 19:00:11 +0100
Subject: [PATCH 1/2] gitignore: Ignore systemd service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6e2130c..4c5799a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,10 +29,11 @@ tests/cpusetrange
 tests/test-read
 lxcfs_mkdir
 tests/test_syscalls
+config/init/systemd/lxcfs.service
 *.o
 tags
 lxcfs-*.tar.gz
 .libs
 *.lo
 *.la
-.vscode
\ No newline at end of file
+.vscode

From e842d86cb7cfb81cbdd52b923383ea2751b23e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 5 Mar 2020 19:00:51 +0100
Subject: [PATCH 2/2] tests: Fix building tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 tests/Makefile.am   | 9 +++++++++
 tests/cpusetrange.c | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69fce08..18015a0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,3 +9,12 @@ EXTRA_DIST = \
 	test_read_proc.sh \
 	test_reload.sh \
 	test_syscalls.c
+
+TEST_READ: test-read.c
+	$(CC) -o test-read test-read.c
+TEST_CPUSET: cpusetrange.c
+	$(CC) -I../ -I../src/ -o cpusetrange cpusetrange.c ../src/cpuset_parse.c
+TEST_SYSCALLS: test_syscalls.c
+	$(CC) -o test_syscalls test_syscalls.c
+
+tests: TEST_READ TEST_CPUSET TEST_SYSCALLS
diff --git a/tests/cpusetrange.c b/tests/cpusetrange.c
index 60e1dd8..06bbe4e 100644
--- a/tests/cpusetrange.c
+++ b/tests/cpusetrange.c
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "../cpuset_parse.h"
+#include "../src/cpuset_parse.h"
 
 static void verify(bool condition) {
 	if (condition) {