History

Fix tests Makefiles on Windows

Compiled tcc.exe location is under $(top_srcdir)/win32

Vlad Vissoultchev committed 10 years ago

Commit fa2472c1 parent 5175b1a3 files · +14 −2Browse files

Unified · Split

3 files
  1. tests/Makefile +2 −1
  2. tests/pp/Makefile +8 −1
  3. tests/tests2/Makefile +4 −0
tests/Makefile+2−1
@@ -60,12 +60,13 @@ endif · 59 unmodified lines
6060
6161 # run local version of tcc with local libraries and includes
6262 TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
63+TCC = $(TOP)/tcc $(TCCFLAGS)
6364 ifdef CONFIG_WIN32
6465 TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
66+ TCC = $(TOP)/win32/tcc $(TCCFLAGS)
6567 endif
6668 XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include
6769
68−TCC = $(TOP)/tcc $(TCCFLAGS)
6970 RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS)
7071
7172 DISAS = objdump -d
tests/pp/Makefile+8−1
@@ -2,9 +2,16 @@ · 1 unmodified line
22 # credits: 01..13.c from the pcc cpp-tests suite
33 #
44
5−TCC = ../../tcc
5+TOP = ../..
6+include $(TOP)/Makefile
7+
8+TCC = $(TOP)/tcc
69 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
710
11+ifdef CONFIG_WIN32
12+ TCC = $(top_srcdir)/win32/tcc
13+endif
14+
815 all test : $(TESTS)
916
1017 %.test: %.c %.expect
tests/tests2/Makefile+4−0
@@ -19,6 +19,10 @@ endif · 18 unmodified lines
1919
2020 TCC = $(TOP)/tcc $(TCCFLAGS)
2121
22+ifdef CONFIG_WIN32
23+ TCC = $(top_srcdir)/win32/tcc $(TCCFLAGS)
24+endif
25+
2226 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
2327
2428 # 34_array_assignment.test -- array assignment is not in C standard

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t