Skip to content

Use gnu11 standard for most tests #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 2, 2025
Merged

Use gnu11 standard for most tests #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08bf1ec
Force gnu11 in tests
sim642 Sep 1, 2025
e7a49b2
Force gnu11 in also for some comb tests
sim642 Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ endif
# Disable GCC 14 new warnings as errors because some tests contain them
CFLAGS += -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=int-conversion -Wno-error=incompatible-pointer-types

# TODO: Force gnu11 because we're not ready for c23 yet
CFLAGS += -std=gnu11

# sm: this will make gcc warnings into errors; it's almost never
# what we want, but for a particular testcase (combine_copyptrs)
# I need it to show the difference between something which works
Expand Down Expand Up @@ -176,7 +179,7 @@ SMALL1 := $(TESTDIR)/small1

test/% : $(SMALL1)/%.c
cd $(SMALL1); $(CILLY) --nomerge --commPrintLn \
$(CONLY) -std=gnu90 $(CFLAGS) $(ASMONLY)$*.s $*.c
$(CONLY) $(CFLAGS) -std=gnu90 $(ASMONLY)$*.s $*.c
echo SUCCESS

testobj/% : $(SMALL1)/%.c
Expand Down Expand Up @@ -383,22 +386,22 @@ MYSAFECC := $(CILLY)
comb: $(TESTDIR)/small2/comb1.c $(TESTDIR)/small2/comb2.c
rm -f $(TESTDIR)/small2/comb.exe
cd $(TESTDIR)/small2; \
$(MYSAFECC) -fcommon comb1.c $(CONLY) $(OBJOUT) comb1.o; \
$(MYSAFECC) -fcommon comb2.c $(CONLY) $(OBJOUT) comb2.o; \
$(MYSAFECC) -fcommon comb3.c $(CONLY) $(OBJOUT) comb3.o; \
$(MYSAFECC) -fcommon comb4.c $(CONLY) $(OBJOUT) comb4.o; \
$(MYSAFECC) -fcommon comb1.o comb2.o comb3.o comb4.o $(EXEOUT)comb.exe
$(MYSAFECC) -std=gnu11 -fcommon comb1.c $(CONLY) $(OBJOUT) comb1.o; \
$(MYSAFECC) -std=gnu11 -fcommon comb2.c $(CONLY) $(OBJOUT) comb2.o; \
$(MYSAFECC) -std=gnu11 -fcommon comb3.c $(CONLY) $(OBJOUT) comb3.o; \
$(MYSAFECC) -std=gnu11 -fcommon comb4.c $(CONLY) $(OBJOUT) comb4.o; \
$(MYSAFECC) -std=gnu11 -fcommon comb1.o comb2.o comb3.o comb4.o $(EXEOUT)comb.exe
$(TESTDIR)/small2/comb.exe

#call cilly on a .c file, a .i file, a .s file, and a .o file.
#Of course, only the first two are merged.
mixedcomb: $(TESTDIR)/small2/comb1.c $(TESTDIR)/small2/comb2.c
rm -f $(TESTDIR)/small2/comb.exe
cd $(TESTDIR)/small2; \
gcc -fcommon -E -o comb2.i comb2.c; \
gcc -fcommon -S -o comb3.s comb3.c; \
gcc -fcommon -c -o comb4.o comb4.c; \
$(MYSAFECC) -fcommon comb1.c comb2.i comb3.s comb4.o $(EXEOUT)comb.exe
gcc -std=gnu11 -fcommon -E -o comb2.i comb2.c; \
gcc -std=gnu11 -fcommon -S -o comb3.s comb3.c; \
gcc -std=gnu11 -fcommon -c -o comb4.o comb4.c; \
$(MYSAFECC) -std=gnu11 -fcommon comb1.c comb2.i comb3.s comb4.o $(EXEOUT)comb.exe
$(TESTDIR)/small2/comb.exe

# sm: another merger test
Expand Down
Loading