Skip to content

Commit

Permalink
make hiearachy is working. sample RISCV test is working. code still n…
Browse files Browse the repository at this point in the history 
…eeds to be cleaned up.
  • Loading branch information
@billmcspadden-riscv
billmcspadden-riscv committed Nov 15, 2023
1 parent 8451528 commit 44c312d
Show file tree
Hide file tree
Showing 4 changed files with 399 additions and 240 deletions.
66 changes: 66 additions & 0 deletions new_test/TEST_DIR_ROOT/env.testdir/invocation.testdir/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# vim: set tabstop=4 shiftwidth=4 noexpandtab
# ====================================================================================================================
# Filename: Makefile
#
# Description: Makefile for building and running
#
# Author(s): Bill McSpadden (bill@riscv.org)
#
# Revision: See git log
#
# ====================================================================================================================
#
# SHELL is set to /bin/sh as default for make
# On Ubuntu, /bin/sh is a symlink to /bin/dash
# /bin/dash does not behave much like bash.
# I want bash to be the shell we use in this environment,
# not dash.
SHELL := /bin/bash
$(info SHELL: ${SHELL})

# TEST_DIR_PATH_KEYDIR is the directory name under which the
# test directory exists. This directory contains the items
# needed to build and run RISC-V tests. This keyword is needed
# in order that this makefile and all 'included' makefiles can
# find the consistent set of tools for building and running
# tests.
TEST_DIR_PATH_KEYDIR := TEST_DIR_ROOT

# TEST_DIR_PATH is the full directory path to the current test
# directory. This is an important variable for running in this
# particular enviornment.
TEST_DIR_PATH := $(shell \
sandbox_root=$$PWD ; \
if [[ "$$sandbox_root" =~ /${TEST_DIR_PATH_KEYDIR}/ ]] ; \
then \
while [ ! `basename $$sandbox_root` == ${TEST_DIR_PATH_KEYDIR} ] ; \
do \
sandbox_root=`dirname $$sandbox_root`; \
if [[ $sandbox_root == "/" ]] ; \
then \
echo "NULL" ; \
break ; \
fi; \
done ; \
echo "$$sandbox_root" ; \
else \
echo "NULL" ; \
fi; \
)

$(info TEST_DIR_PATH: ${TEST_DIR_PATH})
$(info TEST_DIR_PATH realpath: $(realpath ${TEST_DIR_PATH}))
$(info TEST_DIR_PATH abspath: $(abspath ${TEST_DIR_PATH}))

# Use the GNU Make Standard Library. It provides a Make API
# for useful data structures and functions.
include ${TEST_DIR_PATH}/lib/gmsl.git/gmsl


TESTDIRS := $(wildcard *.testdir)
ARTIFACTDIRS := $(wildcard *.artifactdir)

$(info Including ${TEST_DIR_PATH}/lib/Makefile.common...)
include ${TEST_DIR_PATH}/lib/Makefile.common


95 changes: 4 additions & 91 deletions new_test/TEST_DIR_ROOT/env.testdir/invocation.testdir/help_usage.testdir/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ include ${TEST_DIR_PATH}/lib/gmsl.git/gmsl

ASM_FLAGS :=
RUN_FLAGS := -h
XLEN := RV32
XLEN := 32
OBJDIR_TMP := $(strip ${XLEN} ${ASM_FLAGS} ${RUN_FLAGS})


Expand Down Expand Up @@ -98,7 +98,7 @@ ASM_FLAGS :=
LD_FILE :=
LD_FLAGS :=
RUN_FLAGS := -h
XLEN := RV64
XLEN := 64
OBJDIR_TMP := $(strip ${XLEN} ${ASM_FLAGS} ${CC_FLAGS} ${LD_FILE} ${LD_FLAGS} ${RUN_FLAGS})


Expand All @@ -119,6 +119,7 @@ $(call set,RUN_FLAGS_AA,${UNIQ_TESTNAME},${RUN_FLAGS})
$(info RUN_FLAGS: $(call get,RUN_FLAGS_AA,${UNIQ_TESTNAME}))
$(call set,XLEN_AA,${UNIQ_TESTNAME},${XLEN})
$(info XLEN: $(call get,XLEN_AA,${UNIQ_TESTNAME}))
$(call set,OBJDIR_AA,${UNIQ_TESTNAME},${OBJDIR}
#=========================================================
#=========================================================
# A test definition
Expand Down Expand Up @@ -153,94 +154,6 @@ $(info TESTLIST: ${TESTLIST})
TESTDIRS := $(wildcard *.testdir)
ARTIFACTDIRS := $(wildcard *.artifactdir)








all:


build:


install:


# Run in parallel (potentially, based on the -j switch to make)
# TODO: also redirect stderr into test.failed
.PHONY: ${TESTLIST}
run_tests : ${TESTLIST}
${TESTLIST} :
@echo "making \"$@\"" ;
@mkdir -p $@.artifactdir || ( echo "unable to create $@.artifactdir" >> test.failed ; exit $$? ; ) ;
@if [ ! -e ${TEST_DIR_PATH}/../../c_emulator/riscv_sim_$(call get,XLEN_AA,$@) ] ; \
then \
echo "${TEST_DIR_PATH}/../../c_emulator/riscv_sim_$@.$(call get,XLEN_AA,$@) does not exist." >> $@.artifactdir/test.failed ; \
fi ;
@${TEST_DIR_PATH}/../../c_emulator/riscv_sim_$(call get,XLEN_AA,$@) $(call get,arr_sw,$@)> $@.artifactdir/test.run.stdout ; \
if [ $$? -ne 0 ] ; \
then \
echo "riscv_sim_$@.$(call get,XLEN_AA,$@) exited with nonzero exit status" >> $@.artifactdir/test.failed ; \
fi ;
@if [ ! -e $@.artifactdir/test.run.stdout ] ; \
then \
echo "file, \"$@.artifactdir/test.run.stdout\" not found" >> $@.artifactdir/test.failed ; \
fi ;
@if [ ! -e $@.artifactdir/test.failed ] ; \
then \
echo "${PWD} passed" >> $@.artifactdir/test.passed ; \
fi;


# Gather all the test results from this directory on down.
# Do not run this target in parallel, else the output into
# ./test.failed will get intermixed and become unreadable.
check :
@echo "$$PWD: making \"$@\"" ;
@rm -f test.passed test.failed ;
@for testdir in ${TESTDIRS}; \
do \
if [ ! -e $$testdir/Makefile ] ; \
then \
echo "ERROR: no Makefile in $$testdir." >> test.failed; \
fi ; \
make -C $$testdir $@ ; \
if [ $$? -ne 0 ] ; \
then \
echo "'make -C $$testdir $@' exited with nonzero exit status" >> test.failed ; \
fi ; \
done;
@for artifactdir in ${ARTIFACTDIRS}; \
do \
if [ -e $$artifactdir/test.failed ] ; \
then \
echo "$$artifactdir/test.failed exists." >> test.failed; \
cat $$artifactdir/test.failed >> test.failed ; \
fi; \
if [ -e $$artifactdir/test.passed ] ; \
then \
echo "$$PWD/$$artifactdir/test.passed exists." >> test.passed; \
fi; \
if [ ! -e $$artifactdir/test.failed ] ; \
then \
if [ ! -e $$artifactdir/test.passed ] ; \
then \
echo "neither $$PWD/$$artifactdir/test.failed nor test.passed exists." >> test.failed ; \
fi ; \
fi; \
done ;



clean:
rm -f test.failed test.passed
rm -rf *.artifactdir

# Cleans local artifacts and the install location
clean_all:

include ${TEST_DIR_PATH}/lib/Makefile.common


Loading

0 comments on commit 44c312d

Please sign in to comment.