github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test fix CI build error

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-06-23 22:36:52 +02:00
parent 845c4080f5
commit c38cae22fb
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@@ -51,4 +51,6 @@ default: $(AOBJS) $(COBJS) $(MAINOBJ)
clean: clean:
find ../ -type f -name '*.o' -exec rm -f {} + find ../ -type f -name '*.o' -exec rm -f {} +
find ../ -type f -name '*.gcda' -exec rm -f {} +
find ../ -type f -name '*.gcno' -exec rm -f {} +
rm -f $(BIN) rm -f $(BIN)

16
tests/build.py
View File

@@ -23,7 +23,7 @@ def build(defines):
print("") print("")
print("Build") print("Build")
print("-----------------------") print("-----------------------", flush=True)
# print(cmd) # print(cmd)
ret = os.system(cmd) ret = os.system(cmd)
if(ret != 0): if(ret != 0):
@@ -32,10 +32,10 @@ def build(defines):
print("") print("")
print("Run") print("Run")
print("-----------------------") print("-----------------------", flush=True)
ret = os.system("./test.bin") ret = os.system("./test.bin")
if(ret != 0): if(ret != 0):
print("RUN ERROR! (error code " + str(ret) + ")") print("RUN ERROR! (error code " + str(ret) + ")", flush=True)
exit(1) exit(1)
@@ -47,7 +47,7 @@ def build_test(defines, test_name):
print("") print("")
print("~~~~~~~~~~~~~~~~~~~~~~~~") print("~~~~~~~~~~~~~~~~~~~~~~~~")
print(re.search("/[a-z_]*$", test_name).group(0)[1:]) print(re.search("/[a-z_]*$", test_name).group(0)[1:])
print("~~~~~~~~~~~~~~~~~~~~~~~~") print("~~~~~~~~~~~~~~~~~~~~~~~~", flush=True)
d_all = base_defines[:-1] + " "; d_all = base_defines[:-1] + " ";
@@ -64,11 +64,11 @@ def build_test(defines, test_name):
print("") print("")
print("Build") print("Build")
print("-----------------------") print("-----------------------", flush=True)
# print(cmd) # print(cmd)
ret = os.system(cmd) ret = os.system(cmd)
if(ret != 0): if(ret != 0):
print("BUILD ERROR! (error code " + str(ret) + ")") print("BUILD ERROR! (error code " + str(ret) + ")", flush=True)
exit(1) exit(1)
print("") print("")
@@ -76,12 +76,12 @@ def build_test(defines, test_name):
print("-----------------------") print("-----------------------")
ret = os.system("./test.bin") ret = os.system("./test.bin")
if(ret != 0): if(ret != 0):
print("RUN ERROR! (error code " + str(ret) + ")") print("RUN ERROR! (error code " + str(ret) + ")", flush=True)
exit(1) exit(1)
def clean(): def clean():
print("") print("")
print("Clean") print("Clean")
print("-----------------------") print("-----------------------", flush=True)
os.system("make clean LVGL_DIR_NAME=" + lvgldirname) os.system("make clean LVGL_DIR_NAME=" + lvgldirname)
os.system("rm -f ./test.bin") os.system("rm -f ./test.bin")

6
tests/main.py
View File

@@ -12,7 +12,7 @@ def build_conf(title, defs):
print("============================================") print("============================================")
print(title) print(title)
print("============================================") print("============================================")
print("") print("", flush=True)
build.clean() build.clean()
build.build(defs) build.build(defs)
@@ -43,9 +43,9 @@ for f in files:
if test_report: if test_report:
print("") print("")
print("Generating report") print("Generating report")
print("-----------------------") print("-----------------------", flush=True)
os.system("rm -r report") os.system("rm -r report")
os.system("mkdir report") os.system("mkdir report")
os.system("gcovr -r ../ --html-details -o report/index.html --exclude-directories '\.\./examples' --exclude-directories 'src/.*' --exclude-directories 'unity' --exclude 'lv_test_.*\.c'") os.system("gcovr -r ../ --html-details -o report/index.html --exclude-directories '\.\./examples' --exclude-directories 'src/.*' --exclude-directories 'unity' --exclude 'lv_test_.*\.c'")
print("Done: See report/index.html") print("Done: See report/index.html", flush=True)

8
tests/test.py
View File

@@ -2,8 +2,9 @@ import os
import glob import glob
def prepare(): def prepare():
os.system("rm src/test_runners/test_*_Runner.c")
os.system("rm src/*.o") os.system("rm src/*.o")
os.system("rm -rdf src/test_runners")
os.system("mkdir src/test_runners")
files = glob.glob("./src/test_cases/test_*.c") files = glob.glob("./src/test_cases/test_*.c")
for index, item in enumerate(files): for index, item in enumerate(files):
@@ -12,11 +13,10 @@ def prepare():
break break
files.insert(0, "./src/test_cases/test_config.c") files.insert(0, "./src/test_cases/test_config.c")
print(files)
for f in files: for f in files:
r = f[:-2] + "_Runner.c" r = f[:-2] + "_Runner.c"
r = r.replace("/test_cases/", "/test_runners/") r = r.replace("/test_cases/", "/test_runners/")
os.system("ruby unity/generate_test_runner.rb " + f + " " + r + " config.yml") cmd = "ruby unity/generate_test_runner.rb " + f + " " + r + " config.yml"
os.system(cmd)
return files return files