Skip to content

Commit 67964ff

Browse files
committed
fix: add cond check in build log gen to solve 'make setup' exist bug
1 parent 79fa9e6 commit 67964ff

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/unit-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
cd rtl
1616
chmod +x scripts/install.sh
1717
make install
18-
# chmod +x scripts/setup.sh
19-
# make setup
18+
chmod +x scripts/setup.sh
19+
make setup

rtl/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ demoTest:
184184
simpleTestbinFile = $(foreach dir, $(SIMPLETEST_HOME)/build, $(wildcard $(dir)/*.bin))
185185
simpleTestCaseName = $(foreach file, $(simpleTestbinFile), $(patsubst %-riscv64-mycpu, simpletest-%, $(basename $(notdir $(file)))))
186186
simpleTestLogFile = $(foreach file, $(simpleTestCaseName), $(patsubst %, %-log.txt, $(file)))
187-
$(shell mkdir -p $(SIMPLETEST_HOME)/build/log 1>/dev/null 2>&1)
187+
$(shell if [[ -d $(SIMPLETEST_HOME) ]]; then mkdir -p $(SIMPLETEST_HOME)/build/log 1>/dev/null 2>&1; fi)
188188

189189
simpleRecursiveTest: $(simpleTestLogFile) $(simpleTestCaseName)
190190
@printf "[\033[0;33m%s\033[0m]\n" all-done
@@ -202,11 +202,12 @@ $(simpleTestCaseName): simpletest-%: $(SIMPLETEST_HOME)/build/%-riscv64-mycpu.bi
202202

203203

204204
###### riscv test recursive test target ######
205+
riscvNum = 50
205206
riscvTestbinFile = $(foreach dir, $(RISCVTEST_HOME)/build, $(wildcard $(dir)/*.bin))
206207
riscvTestCaseName = $(foreach file, $(riscvTestbinFile), $(patsubst %-riscv64-mycpu, riscvtest-%, $(basename $(notdir $(file)))))
207208
riscvTestLogFile = $(foreach file, $(riscvTestCaseName), $(patsubst %, %-log.txt, $(file)))
208-
riscvNum = 50
209-
$(shell mkdir -p $(RISCVTEST_HOME)/build/log 1>/dev/null 2>&1)
209+
$(shell if [[ -d $(RISCVTEST_HOME) ]]; then mkdir -p $(RISCVTEST_HOME)/build/log 1>/dev/null 2>&1; fi)
210+
210211
riscvRecursiveTest: $(riscvTestLogFile) $(riscvTestCaseName)
211212
@printf "[\033[0;33mall-done\033[0m]\n"
212213
@echo -e "[\033[0;33mAll: $$(cat $(RISCVTEST_HOME)/build/log/allcasenum-log.txt) \033[0;32mPASS: $$(cat $(RISCVTEST_HOME)/build/log/passcasenum-log.txt) \033[0;31mFAIL: $$(echo $$(echo $$(cat $(RISCVTEST_HOME)/build/log/allcasenum-log.txt) - $$(cat $(RISCVTEST_HOME)/build/log/passcasenum-log.txt) | bc))\033[0m]";
@@ -226,7 +227,8 @@ $(riscvTestCaseName): riscvtest-%: $(RISCVTEST_HOME)/build/%-riscv64-mycpu.bin
226227
cpuTestbinFile = $(foreach dir, $(CPUTEST_HOME)/build, $(wildcard $(dir)/*.bin))
227228
cpuTestCaseName = $(foreach file, $(cpuTestbinFile), $(patsubst %-riscv64-mycpu, cputest-%, $(basename $(notdir $(file)))))
228229
cpuTestLogFile = $(foreach file, $(cpuTestCaseName), $(patsubst %, %-log.txt, $(file)))
229-
$(shell mkdir -p $(CPUTEST_HOME)/build/log 1>/dev/null 2>&1)
230+
$(shell if [[ -d $(CPUTEST_HOME) ]]; then mkdir -p $(CPUTEST_HOME)/build/log 1>/dev/null 2>&1; fi)
231+
230232
cpuRecursiveTest: $(cpuTestLogFile) $(cpuTestCaseName)
231233
@printf "[\033[0;33mall-done\033[0m]\n"
232234
@echo -e "[\033[0;33mAll: $$(cat $(CPUTEST_HOME)/build/log/allcasenum-log.txt) \033[0;32mPASS: $$(cat $(CPUTEST_HOME)/build/log/passcasenum-log.txt) \033[0;31mFAIL: $$(echo $$(echo $$(cat $(CPUTEST_HOME)/build/log/allcasenum-log.txt) - $$(cat $(CPUTEST_HOME)/build/log/passcasenum-log.txt) | bc))\033[0m]";

rtl/scripts/setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ configAbstractMachine() {
7171
configTestSuites() {
7272
mkdir -p ${AM_FOLDER_PATH}
7373
cd ${AM_FOLDER_PATH}
74-
echo "=====[aft] abstract machine ====="
75-
ls
7674
if [[ -d ${RISCV_TESTS_FOLDER_PATH} ]]; then
7775
echo -e "${RIGHT}riscv-tests exist!${END}"
7876
else

0 commit comments

Comments
 (0)