Skip to content

Commit 9f4c9ab

Browse files
committed
7.4.0
1 parent dd08b85 commit 9f4c9ab

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

qutest/dpp-comp/test_dpp/make_posix

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
##############################################################################
22
# Product: Makefile for QUTEST; QP/C on POSIX *Target*
3-
// Last updated for version 7.3.0
4-
// Last updated on 2023-07-27
3+
# Last Updated for Version: 7.4.0
4+
# Date of the Last Update: 2024-07-31
55
#
66
# Q u a n t u m L e a P s
77
# ------------------------
88
# Modern Embedded Software
99
#
10-
# Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
10+
# Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
1111
#
1212
# This program is open source software: you can redistribute it and/or
1313
# modify it under the terms of the GNU General Public License as published
@@ -77,10 +77,10 @@ endif
7777

7878
# C source files...
7979
C_SRCS := \
80-
bsp.c \
80+
test_dpp.c \
8181
philo.c \
8282
table.c \
83-
test_dpp.c
83+
bsp.c
8484

8585
# C++ source files...
8686
CPP_SRCS :=
@@ -134,10 +134,17 @@ CPP := g++
134134
LINK := gcc # for C programs
135135
#LINK := g++ # for C++ programs
136136

137+
#-----------------------------------------------------------------------------
138+
# QUTest test script utilities (requires QTOOLS):
139+
#
140+
ifeq ("$(wildcard $(QUTEST))","")
141+
QUTEST := python3 $(QTOOLS)/qutest/qutest.py
142+
endif
143+
137144
#-----------------------------------------------------------------------------
138145
# basic utilities:
139146

140-
MKDIR := mkdir -p
147+
MKDIR := mkdir
141148
RM := rm -f
142149

143150
#-----------------------------------------------------------------------------
@@ -193,7 +200,7 @@ $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT)
193200
run : $(TARGET_EXE)
194201
set -e; while true; do \
195202
echo "restarting $(TARGET_EXE)"; \
196-
$(TARGET_EXE) "" $(HOST); \
203+
$(TARGET_EXE) $(HOST); \
197204
done
198205

199206
$(BIN_DIR)/%.d : %.cpp
@@ -219,6 +226,7 @@ endif
219226

220227
test :
221228
$(QUTEST) -q$(QSPY) -l$(LOG) -o$(OPT) -- $(TESTS)
229+
222230
clean :
223231
-$(RM) $(BIN_DIR)/*.o \
224232
$(BIN_DIR)/*.d \
@@ -239,4 +247,3 @@ show :
239247
@echo LIBS = $(LIBS)
240248
@echo DEFINES = $(DEFINES)
241249
@echo HOST = $(HOST)
242-

qutest/dpp/test_dpp/make_posix

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##############################################################################
22
# Product: Makefile for QUTEST; QP/C on POSIX *Target*
3-
# Last Updated for Version: 7.2.0
4-
# Date of the Last Update: 2022-12-21
3+
# Last Updated for Version: 7.4.0
4+
# Date of the Last Update: 2024-07-31
55
#
66
# Q u a n t u m L e a P s
77
# ------------------------
@@ -25,7 +25,7 @@
2525
# GNU General Public License for more details.
2626
#
2727
# You should have received a copy of the GNU General Public License
28-
# along with this program. If not, see <http://www.gnu.org/licenses>.
28+
# along with this program. If not, see <www.gnu.org/licenses/>.
2929
#
3030
# Contact information:
3131
# <www.state-machine.com/licensing>
@@ -134,10 +134,17 @@ CPP := g++
134134
LINK := gcc # for C programs
135135
#LINK := g++ # for C++ programs
136136

137+
#-----------------------------------------------------------------------------
138+
# QUTest test script utilities (requires QTOOLS):
139+
#
140+
ifeq ("$(wildcard $(QUTEST))","")
141+
QUTEST := python3 $(QTOOLS)/qutest/qutest.py
142+
endif
143+
137144
#-----------------------------------------------------------------------------
138145
# basic utilities:
139146

140-
MKDIR := mkdir -p
147+
MKDIR := mkdir
141148
RM := rm -f
142149

143150
#-----------------------------------------------------------------------------
@@ -193,7 +200,7 @@ $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT)
193200
run : $(TARGET_EXE)
194201
set -e; while true; do \
195202
echo "restarting $(TARGET_EXE)"; \
196-
$(TARGET_EXE) "" $(HOST); \
203+
$(TARGET_EXE) $(HOST); \
197204
done
198205

199206
$(BIN_DIR)/%.d : %.cpp
@@ -219,6 +226,7 @@ endif
219226

220227
test :
221228
$(QUTEST) -q$(QSPY) -l$(LOG) -o$(OPT) -- $(TESTS)
229+
222230
clean :
223231
-$(RM) $(BIN_DIR)/*.o \
224232
$(BIN_DIR)/*.d \
@@ -239,4 +247,3 @@ show :
239247
@echo LIBS = $(LIBS)
240248
@echo DEFINES = $(DEFINES)
241249
@echo HOST = $(HOST)
242-

qutest/self_test/test/make_posix

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
##############################################################################
22
# Product: Makefile for QUTEST; QP/C on POSIX *Target*
3-
# Last Updated for Version: 7.1.4
4-
# Date of the Last Update: 2022-12-11
3+
# Last Updated for Version: 7.4.0
4+
# Date of the Last Update: 2024-07-31
55
#
66
# Q u a n t u m L e a P s
77
# ------------------------
88
# Modern Embedded Software
99
#
10-
# Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
10+
# Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
1111
#
1212
# This program is open source software: you can redistribute it and/or
1313
# modify it under the terms of the GNU General Public License as published
@@ -131,10 +131,17 @@ CPP := g++
131131
LINK := gcc # for C programs
132132
#LINK := g++ # for C++ programs
133133

134+
#-----------------------------------------------------------------------------
135+
# QUTest test script utilities (requires QTOOLS):
136+
#
137+
ifeq ("$(wildcard $(QUTEST))","")
138+
QUTEST := python3 $(QTOOLS)/qutest/qutest.py
139+
endif
140+
134141
#-----------------------------------------------------------------------------
135142
# basic utilities:
136143

137-
MKDIR := mkdir -p
144+
MKDIR := mkdir
138145
RM := rm -f
139146

140147
#-----------------------------------------------------------------------------
@@ -190,7 +197,7 @@ $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT)
190197
run : $(TARGET_EXE)
191198
set -e; while true; do \
192199
echo "restarting $(TARGET_EXE)"; \
193-
$(TARGET_EXE) "" $(HOST); \
200+
$(TARGET_EXE) $(HOST); \
194201
done
195202

196203
$(BIN_DIR)/%.d : %.cpp
@@ -214,6 +221,9 @@ ifneq ($(MAKECMDGOALS),clean)
214221
endif
215222
endif
216223

224+
test :
225+
$(QUTEST) -q$(QSPY) -l$(LOG) -o$(OPT) -- $(TESTS)
226+
217227
clean :
218228
-$(RM) $(BIN_DIR)/*.o \
219229
$(BIN_DIR)/*.d \
@@ -234,4 +244,3 @@ show :
234244
@echo LIBS = $(LIBS)
235245
@echo DEFINES = $(DEFINES)
236246
@echo HOST = $(HOST)
237-

0 commit comments

Comments
 (0)