]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: correctly configure the NUMA node memory pool
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 14 Jun 2021 13:45:03 +0000 (15:45 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 14 Jun 2021 20:37:28 +0000 (05:37 +0900)
The currently hardcoded value works with the default configuration, but
breaks when QEMU_MEM != 512M (in sanitizer runs, for example).

```
# QEMU_MEM=1G make -C test/TEST-36-NUMAPOLICY/ run
make: Entering directory '/home/fsumsal/repos/@systemd/systemd/test/TEST-36-NUMAPOLICY'
TEST-36-NUMAPOLICY RUN: test NUMAPolicy= and NUMAMask= options
+ /bin/qemu-kvm -smp 8 -net none -m 1G -nographic -kernel /boot/vmlinuz-5.12.5-300.fc34.x86_64 -drive format=raw'
qemu-kvm: total memory for NUMA nodes (0x20000000) should equal RAM size (0x40000000)
E: QEMU failed with exit code 1
```

test/TEST-36-NUMAPOLICY/test.sh

index f1c36b3d6b64d069b1850698a31f819341447f9a..fddd5b672750e36b2d5d845e7f70647338c353c0 100755 (executable)
@@ -8,7 +8,7 @@ TEST_NO_NSPAWN=1
 . "${TEST_BASE_DIR:?}/test-functions"
 
 if qemu_min_version "5.2.0"; then
-    QEMU_OPTIONS="-object memory-backend-ram,id=mem0,size=512M -numa node,memdev=mem0,nodeid=0"
+    QEMU_OPTIONS="-object memory-backend-ram,id=mem0,size=${QEMU_MEM:?QEMU_MEM is unset} -numa node,memdev=mem0,nodeid=0"
 else
     QEMU_OPTIONS="-numa node,nodeid=0"
 fi