Makefile - Issue 5500001: Eliminate the dependency on kernel pseudo-files when running unit tests

Side by Side Diff: Makefile

Issue 5500001: Eliminate the dependency on kernel pseudo-files when running unit tests (Closed) Base URL: http://git.chromium.org/git/bootstat.git@master

Patch Set: Miscellaneous cleanup Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4 #	4 #

5 # Makefile for bootstat utilities	5 # Makefile for bootstat utilities

6 #	6 #

7	7

8 # OPT_CFLAGS is here to allow adding options for manual, host-side	8 # OPT_CFLAGS is here to allow adding options for manual, host-side

9 # builds.	9 # builds.

10 OPT_CFLAGS =	10 OPT_CFLAGS =

11 CFLAGS += -Wall -Werror -fPIC -fno-exceptions $(OPT_CFLAGS)	11 COMMON_CFLAGS += -Wall -Werror -fPIC -fno-exceptions $(OPT_CFLAGS)

	12

	13 tests: COMMON_CFLAGS += -DCONFIG_UNIT_TEST
	kmixter1 2010/12/06 04:23:52 This is a new syntax to me, assuming you know it w This is a new syntax to me, assuming you know it works and doesn't mess up if you do make all tests. jrbarnette 2010/12/06 17:47:46 Mmmm... If you say 'make' or 'make all', or other Show quoted text On 2010/12/06 04:23:52, kmixter1 wrote: > This is a new syntax to me, assuming you know it works and doesn't mess up if > you do make all tests. Mmmm... If you say 'make' or 'make all', or other invocations that build without -DCONFIG_UNIT_TEST, and then say 'make tests', bootstat.o won't get rebuilt with the changed define, and the build will fail with link errors. If you say 'make clean' in between, it works fine. Is building, then rebuilding with different options (without requiring 'make clean') a use case that should be important? kmixter1 2010/12/06 18:22:36 I was mostly commenting on the fact that the CCFLA Show quoted text On 2010/12/06 17:47:46, jrbarnette wrote: > On 2010/12/06 04:23:52, kmixter1 wrote: > > This is a new syntax to me, assuming you know it works and doesn't mess up if > > you do make all tests. > > Mmmm... If you say 'make' or 'make all', or other invocations that build > without -DCONFIG_UNIT_TEST, and then say 'make tests', bootstat.o won't > get rebuilt with the changed define, and the build will fail with link errors. > > If you say 'make clean' in between, it works fine. > > Is building, then rebuilding with different options (without requiring > 'make clean') a use case that should be important? I was mostly commenting on the fact that the CCFLAGS would be set to having test flags for even the 'make all' part of the build, but you're correctly pointing out that the objects themselves are shared and built differently in the two kinds of builds. This is your call, but I usually prefer to make the object not have -D's for test code, just include the test code in production build (particularly if it's not user visible) as it makes me feel more confidence that there are fewer differences between test and production code. It's no more elegant than having special compilation for tests, but it's easier creating/using a mock interface.
	14

	15 CFLAGS += $(COMMON_CFLAGS)

	16 CXXFLAGS += $(COMMON_CFLAGS)

12	17

13 LIB_OBJS = bootstat_log.o	18 LIB_OBJS = bootstat_log.o

14	19

15 COMMAND_OBJS = bootstat.o	20 COMMAND_OBJS = bootstat.o

16 COMMAND_LDFLAGS = $(LDFLAGS)	21 COMMAND_LDFLAGS = $(LDFLAGS)

17	22

18 TEST_OBJS = log_unit_tests.o	23 TEST_OBJS = log_unit_tests.o

19 TEST_LDFLAGS = $(LDFLAGS) -lgtest	24 TEST_LDFLAGS = $(LDFLAGS) -lgtest

20	25

21 OBJS = $(LIB_OBJS) $(TEST_OBJS) $(COMMAND_OBJS)	26 OBJS = $(LIB_OBJS) $(TEST_OBJS) $(COMMAND_OBJS)

(...skipping 15 matching lines...) Expand all Loading...
37 $(CC) -o $@ $(COMMAND_LDFLAGS) $^	42 $(CC) -o $@ $(COMMAND_LDFLAGS) $^

38	43

39 $(LIB): $(LIB_OBJS)	44 $(LIB): $(LIB_OBJS)

40 $(AR) rcs $@ $^	45 $(AR) rcs $@ $^

41	46

42 $(TEST): $(TEST_OBJS) $(LIB)	47 $(TEST): $(TEST_OBJS) $(LIB)

43 $(CXX) $(TEST_LDFLAGS) -o $@ $^	48 $(CXX) $(TEST_LDFLAGS) -o $@ $^

44	49

45 clean:	50 clean:

46 rm -f $(COMMAND) $(LIB) $(OBJS) $(TEST)	51 rm -f $(COMMAND) $(LIB) $(OBJS) $(TEST)

OLD	NEW

« no previous file with comments | « no previous file | bootstat_log.c » ('j') | bootstat_log.c » ('J')