logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-07 00:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: added testcommon target to makefile

Browse Source
This commit is contained in:
Lorenzo Delgado 2023-03-31 15:24:04 +02:00 committed by GitHub
parent bd9857c1d8
commit 048ca45dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -131,12 +131,22 @@ clean-librln:
clean: | clean-librln clean: | clean-librln
#################
## Waku Common ##
#################
.PHONY: testcommon
testcommon: | build deps
echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim testcommon $(NIM_PARAMS) waku.nims
############# #############
## Waku v2 ## ## Waku v2 ##
############# #############
.PHONY: test2 wakunode2 example2 sim2 scripts2 wakubridge chat2 chat2bridge .PHONY: test2 wakunode2 example2 sim2 scripts2 wakubridge chat2 chat2bridge
test2: | build deps librln test2: | build deps librln testcommon
echo -e $(BUILD_MSG) "build/$@" && \ echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim test2 $(NIM_PARAMS) $(EXPERIMENTAL_PARAMS) waku.nims $(ENV_SCRIPT) nim test2 $(NIM_PARAMS) $(EXPERIMENTAL_PARAMS) waku.nims
@ -190,11 +200,11 @@ networkmonitor: | build deps
################# #################
.PHONY: testwhisper test1 wakunode1 example1 sim1 .PHONY: testwhisper test1 wakunode1 example1 sim1
testwhisper: | build deps testwhisper: | build deps testcommon
echo -e $(BUILD_MSG) "build/$@" && \ echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim testwhisper $(NIM_PARAMS) waku.nims $(ENV_SCRIPT) nim testwhisper $(NIM_PARAMS) waku.nims
test1: | build deps test1: | build deps testcommon
echo -e $(BUILD_MSG) "build/$@" && \ echo -e $(BUILD_MSG) "build/$@" && \
$(ENV_SCRIPT) nim test1 $(NIM_PARAMS) waku.nims $(ENV_SCRIPT) nim test1 $(NIM_PARAMS) waku.nims

6
tests/all_tests_v2.nim
View File

@ -1,9 +1,3 @@
## Common
# Waku common test suite
import ./all_tests_common
## Waku v2 ## Waku v2
# Waku message test suite # Waku message test suite

10
waku.nimble
View File

@ -41,11 +41,16 @@ proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") =
buildBinary name, "tests/", params buildBinary name, "tests/", params
exec "build/" & name exec "build/" & name
### Whisper tasks
### Waku common tasks
task testcommon, "Build & run common tests":
test "all_tests_common", "-d:chronicles_log_level=WARN -d:chronosStrictException"
### Whisper & Waku v1 tasks
task testwhisper, "Build & run Whisper tests": task testwhisper, "Build & run Whisper tests":
test "all_tests_whisper", "-d:chronicles_log_level=WARN -d:chronosStrictException" test "all_tests_whisper", "-d:chronicles_log_level=WARN -d:chronosStrictException"
### Waku v1 tasks
task wakunode1, "Build Waku v1 cli node": task wakunode1, "Build Waku v1 cli node":
buildBinary "wakunode1", "waku/v1/node/", buildBinary "wakunode1", "waku/v1/node/",
"-d:chronicles_log_level=DEBUG -d:chronosStrictException" "-d:chronicles_log_level=DEBUG -d:chronosStrictException"
@ -63,6 +68,7 @@ task example1, "Build Waku v1 example":
task test1, "Build & run Waku v1 tests": task test1, "Build & run Waku v1 tests":
test "all_tests_v1", "-d:chronicles_log_level=WARN -d:chronosStrictException" test "all_tests_v1", "-d:chronicles_log_level=WARN -d:chronosStrictException"
### Waku v2 tasks ### Waku v2 tasks
task wakunode2, "Build Waku v2 (experimental) cli node": task wakunode2, "Build Waku v2 (experimental) cli node":
let name = "wakunode2" let name = "wakunode2"

5
waku/common/envvar_serialization/utils.nim
View File

@ -3,11 +3,10 @@ when (NimMajor, NimMinor) < (1, 4):
else: else:
{.push raises: [].} {.push raises: [].}
import import
std/[os, strutils], std/[os, strutils],
stew/byteutils, stew/byteutils,
stew/ranges/ptr_arith stew/ptrops
type type