From f12901024d42ef4ee3a9e02ba97874729d999f99 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 29 Dec 2018 18:50:58 +0100 Subject: [PATCH] Add a test for disabled binaries --- tests/binary/Makefile.Darwin | 15 ++++++++++++++- tests/binary/Makefile.DeforaOS | 15 ++++++++++++++- tests/binary/Makefile.NetBSD | 15 ++++++++++++++- tests/binary/Makefile.Windows | 15 ++++++++++++++- tests/binary/project.conf | 8 +++++++- 5 files changed, 63 insertions(+), 5 deletions(-) diff --git a/tests/binary/Makefile.Darwin b/tests/binary/Makefile.Darwin index 739d4ff..4ef009d 100644 --- a/tests/binary/Makefile.Darwin +++ b/tests/binary/Makefile.Darwin @@ -41,6 +41,13 @@ test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(OBJDIR)test4$(EXEEXT): $(test4_OBJS) $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) +test5_OBJS = $(OBJDIR)test5.o $(OBJDIR)main.o +test5_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +test5_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) + +$(OBJDIR)test5$(EXEEXT): $(test5_OBJS) + $(CC) -o $(OBJDIR)test5$(EXEEXT) $(test5_OBJS) $(test5_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -59,8 +66,14 @@ $(OBJDIR)test4.o: test4.asm $(OBJDIR)test4.o: test4.S $(AS) $(test4_CPPFLAGS) -nostdinc $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S +$(OBJDIR)test5.o: test5.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)test5.o -c test5.c + +$(OBJDIR)main.o: main.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)main.o -c main.c + clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) $(test5_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/Makefile.DeforaOS b/tests/binary/Makefile.DeforaOS index 23b5209..07391b2 100644 --- a/tests/binary/Makefile.DeforaOS +++ b/tests/binary/Makefile.DeforaOS @@ -41,6 +41,13 @@ test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(OBJDIR)test4$(EXEEXT): $(test4_OBJS) $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) +test5_OBJS = $(OBJDIR)test5.o $(OBJDIR)main.o +test5_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +test5_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) + +$(OBJDIR)test5$(EXEEXT): $(test5_OBJS) + $(CC) -o $(OBJDIR)test5$(EXEEXT) $(test5_OBJS) $(test5_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -59,8 +66,14 @@ $(OBJDIR)test4.o: test4.asm $(OBJDIR)test4.o: test4.S $(AS) $(test4_CPPFLAGS) -nostdinc $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S +$(OBJDIR)test5.o: test5.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)test5.o -c test5.c + +$(OBJDIR)main.o: main.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)main.o -c main.c + clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) $(test5_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/Makefile.NetBSD b/tests/binary/Makefile.NetBSD index c76ad35..dc3b13e 100644 --- a/tests/binary/Makefile.NetBSD +++ b/tests/binary/Makefile.NetBSD @@ -41,6 +41,13 @@ test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(OBJDIR)test4$(EXEEXT): $(test4_OBJS) $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) +test5_OBJS = $(OBJDIR)test5.o $(OBJDIR)main.o +test5_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +test5_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) + +$(OBJDIR)test5$(EXEEXT): $(test5_OBJS) + $(CC) -o $(OBJDIR)test5$(EXEEXT) $(test5_OBJS) $(test5_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -59,8 +66,14 @@ $(OBJDIR)test4.o: test4.asm $(OBJDIR)test4.o: test4.S $(AS) $(test4_CPPFLAGS) -nostdinc $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S +$(OBJDIR)test5.o: test5.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)test5.o -c test5.c + +$(OBJDIR)main.o: main.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)main.o -c main.c + clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) $(test5_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/Makefile.Windows b/tests/binary/Makefile.Windows index dbc2095..857e60c 100644 --- a/tests/binary/Makefile.Windows +++ b/tests/binary/Makefile.Windows @@ -41,6 +41,13 @@ test4_CPPFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(OBJDIR)test4$(EXEEXT): $(test4_OBJS) $(CC) -o $(OBJDIR)test4$(EXEEXT) $(test4_OBJS) $(test4_LDFLAGS) +test5_OBJS = $(OBJDIR)test5.o $(OBJDIR)main.o +test5_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +test5_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) + +$(OBJDIR)test5$(EXEEXT): $(test5_OBJS) + $(CC) -o $(OBJDIR)test5$(EXEEXT) $(test5_OBJS) $(test5_LDFLAGS) + $(OBJDIR)test.o: test.c $(CC) $(test_CFLAGS) -o $(OBJDIR)test.o -c test.c @@ -59,8 +66,14 @@ $(OBJDIR)test4.o: test4.asm $(OBJDIR)test4.o: test4.S $(AS) $(test4_CPPFLAGS) -nostdinc $(test4_ASFLAGS) -o $(OBJDIR)test4.o test4.S +$(OBJDIR)test5.o: test5.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)test5.o -c test5.c + +$(OBJDIR)main.o: main.c + $(CC) $(test5_CFLAGS) -o $(OBJDIR)main.o -c main.c + clean: - $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) + $(RM) -- $(test_OBJS) $(test2_OBJS) $(test3_OBJS) $(test4_OBJS) $(test5_OBJS) distclean: clean $(RM) -- $(TARGETS) diff --git a/tests/binary/project.conf b/tests/binary/project.conf index f6f7782..7b31205 100644 --- a/tests/binary/project.conf +++ b/tests/binary/project.conf @@ -1,4 +1,4 @@ -targets=test,test2,test3,test4 +targets=test,test2,test3,test4,test5 dist=Makefile [test] @@ -25,3 +25,9 @@ asflags=-m32 [test4.S] cppflags=-nostdinc + +[test5] +type=binary +enabled=0 +sources=test5.c,main.c +install=$(BINDIR)