From 3f00bd2c7b89ff9df71c2e489cd9929c3d0627e4 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Wed, 22 Mar 2023 18:00:52 +0900 Subject: [PATCH 1/3] test: set min_chunk_sz to 32768 on test_min_chunk Page size of arm mac is 16384. --- test/test_e2e.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_e2e.py b/test/test_e2e.py index 018be96..9c98247 100644 --- a/test/test_e2e.py +++ b/test/test_e2e.py @@ -139,7 +139,7 @@ def test_min_chunk(mscp, src_prefix, dst_prefix): src = File("src", size = 16 * 1024).make() dst = File("dst") - run2ok([mscp, "-H", "-s", 8192, src_prefix + src.path, dst_prefix + dst.path]) + run2ok([mscp, "-H", "-s", 32768, src_prefix + src.path, dst_prefix + dst.path]) assert check_same_md5sum(src, dst) src.cleanup() @@ -150,7 +150,7 @@ def test_thread_affinity(mscp, src_prefix, dst_prefix): src = File("src", size = 64 * 1024).make() dst = File("dst") - run2ok([mscp, "-H", "-n", 4, "-m", "0x01", "-s", 8192, "-S", 65536, + run2ok([mscp, "-H", "-n", 4, "-m", "0x01", src_prefix + src.path, dst_prefix + dst.path]) assert check_same_md5sum(src, dst) From 81921511540098bfcb192c892a35d16158990e79 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Wed, 22 Mar 2023 18:06:19 +0900 Subject: [PATCH 2/3] fix invalid return sem --- src/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform.c b/src/platform.c index 9346ce6..1a8357d 100644 --- a/src/platform.c +++ b/src/platform.c @@ -101,7 +101,7 @@ sem_t *sem_create(int value) if (sem_init(sem, 0, value) < 0) { free(sem); - return sem; + return NULL; } return sem; From 6be61e8adff9690fd2d0cc943a1ac63939b5f0d8 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Wed, 22 Mar 2023 19:24:14 +0900 Subject: [PATCH 3/3] test: add sleep -1 before ssh-keyscan --- scripts/test-in-container.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/test-in-container.sh b/scripts/test-in-container.sh index 1e003b3..cdaef47 100755 --- a/scripts/test-in-container.sh +++ b/scripts/test-in-container.sh @@ -11,6 +11,7 @@ set -x # Run sshd if [ ! -e /var/run/sshd.pid ]; then /usr/sbin/sshd + sleep 1 fi ssh-keyscan localhost >> ${HOME}/.ssh/known_hosts