diff --git a/misc/native/c.sh b/misc/native/c.sh index 44b6371306..ff7f3ce1e9 100755 --- a/misc/native/c.sh +++ b/misc/native/c.sh @@ -1,16 +1,6 @@ #!/bin/sh TR=../../binTmp -UM=`uname -m` - -if which clang > /dev/null ; then - CC="clang" - BC="clang -target bpf" - BS="llvm-strip" - else - CC="gcc" - BC="bpf-gcc" - BS="bpf-strip" - fi +mkdir -p $TR MD="-O0 -g" #devel MD="-O3 -g" #debug @@ -18,14 +8,26 @@ MD="-O3" #release #gdb xxx.bin core #bt full #p *((struct *)()) -mkdir -p $TR +UM=`uname -m` MF="" if [ "$UM" = "x86_64" ]; then MF="-march=corei7" fi -echo arch=$UM, cc=$CC, bc=$BC, bs=$BS, mode=$MD, flag=$MF, out=$TR +if which clang > /dev/null ; then + CC="clang" + CS="llvm-strip" + BC="clang -target bpf" + BS="llvm-strip" + else + CC="gcc" + CS="strip" + BC="bpf-gcc" + BS="bpf-strip" + fi + +echo arch=$UM, cc=$CC, cs=$CS, bc=$BC, bs=$BS, mode=$MD, flag=$MF, out=$TR compileBpf() { @@ -40,7 +42,7 @@ compileLib() echo compiling $1. $CC -fpic -shared -Wall -Wl,--build-id=none $MD $3 -o$TR/lib$1.so $2 $1.c chmod -x $TR/lib$1.so || true -strip $TR/lib$1.so || true +$CS $TR/lib$1.so || true touch -c -d "2010-01-01 00:00:00" $TR/lib$1.so || true } @@ -48,7 +50,7 @@ linkTwoLibs() { echo linking $1. $CC -Wall -Wl,-rpath='$ORIGIN/' -Wl,--build-id=none $MD -o$TR/$1.bin -L$TR -l$2 -l$3 $4 -strip $TR/$1.bin || true +$CS $TR/$1.bin || true touch -c -d "2010-01-01 00:00:00" $TR/$1.bin || true } @@ -56,7 +58,7 @@ compileFile() { echo compiling $1. $CC -Wall -Wl,--build-id=none $MD $4 -o$TR/$1.bin $2 $1.c $3 -strip $TR/$1.bin || true +$CS $TR/$1.bin || true touch -c -d "2010-01-01 00:00:00" $TR/$1.bin || true } diff --git a/src/rtr.csv b/src/rtr.csv index f41c6a6662..436e94b396 100644 --- a/src/rtr.csv +++ b/src/rtr.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.4-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-04 10:48:53, took 00:14:47, with 50 workers, on 3604 cases, 0 failed, 0 traces, 4 retries +-;-;-;2025-01-04 11:20:35, took 00:15:02, with 50 workers, on 3604 cases, 0 failed, 0 traces, 2 retries -;-;-;./rtr.bin http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot diff --git a/src/rtr.html b/src/rtr.html index 27933f2fa6..c0e7b7a62f 100644 --- a/src/rtr.html +++ b/src/rtr.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.4-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-04 10:48:53, took 00:14:47, with 50 workers, on 3604 cases, 0 failed, 0 traces, 4 retries
+tested: 2025-01-04 11:20:35, took 00:15:02, with 50 workers, on 3604 cases, 0 failed, 0 traces, 2 retries
jvm: ./rtr.bin

diff --git a/src/rtr8.csv b/src/rtr8.csv index 9d7a272ee7..f1c981338d 100644 --- a/src/rtr8.csv +++ b/src/rtr8.csv @@ -1,6 +1,6 @@ url;file;result;test -;-;-;freeRouter v25.1.4-cur, done by sprscc13@mrn0b0dy. --;-;-;2025-01-04 10:58:58, took 00:09:43, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries +-;-;-;2025-01-04 11:33:57, took 00:12:59, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries -;-;-;./rtr.bin http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list diff --git a/src/rtr8.html b/src/rtr8.html index 97d9fdbb82..e9d168fd42 100644 --- a/src/rtr8.html +++ b/src/rtr8.html @@ -10,7 +10,7 @@ tester release: freeRouter v25.1.4-cur, done by sprscc13@mrn0b0dy.
-tested: 2025-01-04 10:58:58, took 00:09:43, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
+tested: 2025-01-04 11:33:57, took 00:12:59, with 50 workers, on 674 cases, 0 failed, 0 traces, 0 retries
jvm: ./rtr.bin

fileresulttest
fileresulttest