Skip to content

Commit 87619af

Browse files
committed
Fix worker threads test
1 parent 2d7c4a5 commit 87619af

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

test/Makefile

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
MK_PATH:=$(shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
22
ACTONC=$(MK_PATH)/dist/bin/actonc --cpedantic
3-
DDB_SERVER=../dist/bin/actondb
4-
TESTS= \
5-
$(DDB_TESTS)
3+
TESTS=test_db_app_no_quorum rts/wthreads1
64
test:
75
$(MAKE) $(TESTS)
86

9-
10-
ddb-tests:
11-
$(MAKE) $(DDB_TESTS)
12-
13-
DDB_TESTS=test_db_app_no_quorum
14-
.PHONY: $(DDB_TESTS)
7+
.PHONY: $(TESTS)
158

169
test_db_app_no_quorum:
1710
@echo "Skipping because this is essentially broken"
1811
#$(ACTONC) --root main test_db_app.act
1912
#./test_db.py TestDbAppsNoQuorum
2013

2114

22-
# Expect 9 threads given 7 workers + main process + IO
15+
# Expect 10 threads given 7 workers + main process + IO + new IO
2316
rts/wthreads1:
24-
$(ACTONC) --root main $@.act
25-
./$@ --rts-wthreads 7 & PID=$$! && ps -o thcount $${PID} | tail -n1 | awk '{ print $$1 }' | grep "^9$$"
17+
$(ACTONC) $@.act
18+
./$@ --rts-wthreads 7 & PID=$$! && ps -o thcount $${PID} | tail -n1 | awk '{ print $$1 }' | grep "^10$$"

0 commit comments

Comments
 (0)