Skip to content

Commit 4497bac

Browse files
raiden00pllupyuen
authored andcommitted
boards: use NTFC from pip for citest configs
use NTFC from pip for citest configs Signed-off-by: raiden00pl <raiden00@railab.me>
1 parent 65cfcc4 commit 4497bac

6 files changed

Lines changed: 6 additions & 36 deletions

File tree

  • boards
    • arm64/qemu/qemu-armv8a/configs
    • arm/imx6/sabre-6quad/configs/citest
    • risc-v/qemu-rv/rv-virt/configs
    • sim/sim/sim/configs/citest

boards/arm/imx6/sabre-6quad/configs/citest/run.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,15 @@ olddir=$(pwd)
2828
nuttdir=${CURRENTCONFDIR}/../../../../../../
2929
cd ${nuttdir}
3030

31-
# enable venv
32-
source ${NTFCDIR}/venv/bin/activate
33-
3431
# run NTFC
3532
confpath=${CURRENTCONFDIR}/config.yaml
3633
jsonconf=${CURRENTCONFDIR}/session.json
3734
testpath=${NTFCDIR}/external/nuttx-testing
38-
python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
35+
ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
3936

4037
ret="$?"
4138
echo $ret
4239

43-
# disable venv
44-
deactivate
45-
4640
# export test results
4741
artifacts=${ARTIFACTCONFDIR}/ntfc
4842
mkdir -p ${artifacts}

boards/arm64/qemu/qemu-armv8a/configs/citest/run.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,15 @@ olddir=$(pwd)
2828
nuttdir=${CURRENTCONFDIR}/../../../../../../
2929
cd ${nuttdir}
3030

31-
# enable venv
32-
source ${NTFCDIR}/venv/bin/activate
33-
3431
# run NTFC
3532
confpath=${CURRENTCONFDIR}/config.yaml
3633
jsonconf=${CURRENTCONFDIR}/session.json
3734
testpath=${NTFCDIR}/external/nuttx-testing
38-
python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
35+
ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
3936

4037
ret="$?"
4138
echo $ret
4239

43-
# disable venv
44-
deactivate
45-
4640
# export test results
4741
artifacts=${ARTIFACTCONFDIR}/ntfc
4842
mkdir -p ${artifacts}

boards/arm64/qemu/qemu-armv8a/configs/citest_smp/run.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,15 @@ olddir=$(pwd)
2828
nuttdir=${CURRENTCONFDIR}/../../../../../../
2929
cd ${nuttdir}
3030

31-
# enable venv
32-
source ${NTFCDIR}/venv/bin/activate
33-
3431
# run NTFC
3532
confpath=${CURRENTCONFDIR}/config.yaml
3633
jsonconf=${CURRENTCONFDIR}/session.json
3734
testpath=${NTFCDIR}/external/nuttx-testing
38-
python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
35+
ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
3936

4037
ret="$?"
4138
echo $ret
4239

43-
# disable venv
44-
deactivate
45-
4640
# export test results
4741
artifacts=${ARTIFACTCONFDIR}/ntfc
4842
mkdir -p ${artifacts}

boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,15 @@ dd if=/dev/zero of=fatfs.img bs=512 count=128K
3333
mkfs.fat fatfs.img
3434
chmod 777 ./fatfs.img
3535

36-
# enable venv
37-
source ${NTFCDIR}/venv/bin/activate
38-
3936
# run NTFC
4037
confpath=${CURRENTCONFDIR}/config.yaml
4138
jsonconf=${CURRENTCONFDIR}/session.json
4239
testpath=${NTFCDIR}/external/nuttx-testing
43-
python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
40+
ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
4441

4542
ret="$?"
4643
echo $ret
4744

48-
# disable venv
49-
deactivate
50-
5145
# export test results
5246
artifacts=${ARTIFACTCONFDIR}/ntfc
5347
mkdir -p ${artifacts}

boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ source ${NTFCDIR}/venv/bin/activate
3535
confpath=${CURRENTCONFDIR}/config.yaml
3636
jsonconf=${CURRENTCONFDIR}/session.json
3737
testpath=${NTFCDIR}/external/nuttx-testing
38-
python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
38+
ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
3939

4040
ret="$?"
4141
echo $ret

boards/sim/sim/sim/configs/citest/run.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,15 @@ olddir=$(pwd)
2828
nuttdir=${CURRENTCONFDIR}/../../../../../../
2929
cd ${nuttdir}
3030

31-
# enable venv
32-
source ${NTFCDIR}/venv/bin/activate
33-
3431
# run NTFC
3532
confpath=${CURRENTCONFDIR}/config.yaml
3633
jsonconf=${CURRENTCONFDIR}/session.json
3734
testpath=${NTFCDIR}/external/nuttx-testing
38-
python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
35+
ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
3936

4037
ret="$?"
4138
echo $ret
4239

43-
# disable venv
44-
deactivate
45-
4640
# export test results
4741
artifacts=${ARTIFACTCONFDIR}/ntfc
4842
mkdir -p ${artifacts}

0 commit comments

Comments
 (0)