Skip to content

Commit c894da3

Browse files
join
1 parent aea6e25 commit c894da3

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

exercises/practice/baffling-birthdays/Makefile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
1+
PLATFORM = $(shell uname -m)
2+
3+
ifneq ($(PLATFORM),aarch64)
14
ifeq ($(origin AS),default)
25
AS = aarch64-linux-gnu-as
36
endif
47
ifeq ($(origin CC),default)
58
CC = aarch64-linux-gnu-gcc
69
endif
10+
endif
711

8-
CFLAGS ?= -g -Wall -Wextra -pedantic -Werror
9-
LDFLAGS =
10-
11-
ALL_LDFLAGS = -pie -Wl,--fatal-warnings
12-
13-
ALL_CFLAGS = -std=c99 -fPIE $(CFLAGS)
14-
ALL_LDFLAGS += $(LDFLAGS)
12+
CFLAGS ?= -g -Wall -Wextra -pedantic -Werror -std=c99 -fPIE
13+
LDFLAGS ?= -pie -Wl,--fatal-warnings
1514

1615
C_OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
1716
AS_OBJS = $(patsubst %.s,%.o,$(wildcard *.s))
1817
ALL_OBJS = $(filter-out example.o,$(C_OBJS) $(AS_OBJS) vendor/unity.o)
1918

2019
CC_CMD = $(CC) $(ALL_CFLAGS) -c -o $@ $<
2120

22-
PLATFORM = $(shell uname -m)
2321
ifeq ($(PLATFORM),aarch64)
24-
MAYBE_QEMU =
22+
MAYBE_QEMU ?=
2523
else
26-
MAYBE_QEMU = qemu-aarch64 -L /usr/aarch64-linux-gnu
24+
MAYBE_QEMU ?= qemu-aarch64 -L /usr/aarch64-linux-gnu
2725
endif
2826

2927
all: tests
3028
@$(MAYBE_QEMU) ./$<
3129

3230
tests: $(ALL_OBJS)
33-
@$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $(ALL_OBJS)
31+
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ALL_OBJS)
3432

3533
%.o: %.s
3634
@$(AS) -o $@ $<

generators/exercises/baffling_birthdays.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
extern double estimate(int group_size);
1111
"""
1212

13+
1314
def gen_func_body(prop, inp, expected):
1415
if prop == "shared_birthday":
1516
str_list = []
1617
if expected:
1718
macro = "TEST_ASSERT_TRUE"
1819
else:
1920
macro = "TEST_ASSERT_FALSE"
20-
birthdates = str(inp["birthdates"]).replace('[', '{').replace(']', ', NULL}').replace("'", '"')
21+
birthdates = '{"' + '", "'.join(inp["birthdates"]) + '", NULL}'
2122
str_list.append(f"const char *birthdates[] = {birthdates};")
2223
str_list.append(f"{macro}({prop}(birthdates));\n")
2324
return "\n".join(str_list)

0 commit comments

Comments
 (0)