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
60 60
61# run local version of tcc with local libraries and includes61# run local version of tcc with local libraries and includes
62TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)62TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
63TCC = $(TOP)/tcc $(TCCFLAGS)
63ifdef CONFIG_WIN3264ifdef CONFIG_WIN32
64 TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)65 TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
66 TCC = $(TOP)/win32/tcc $(TCCFLAGS)
65endif67endif
66XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include68XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include
67 69
68TCC = $(TOP)/tcc $(TCCFLAGS)
69RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS)70RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS)
70 71
71DISAS = objdump -d72DISAS = objdump -d
tests/pp/Makefile+8−1
@@ -2,9 +2,16 @@ · 1 unmodified line
2# credits: 01..13.c from the pcc cpp-tests suite2# credits: 01..13.c from the pcc cpp-tests suite
3#3#
4 4
5TCC = ../../tcc5TOP = ../..
6include $(TOP)/Makefile
7
8TCC = $(TOP)/tcc
6TESTS = $(patsubst %.c,%.test,$(wildcard *.c))9TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
7 10
11ifdef CONFIG_WIN32
12 TCC = $(top_srcdir)/win32/tcc
13endif
14
8all test : $(TESTS)15all test : $(TESTS)
9 16
10%.test: %.c %.expect17%.test: %.c %.expect
tests/tests2/Makefile+4−0
@@ -19,6 +19,10 @@ endif · 18 unmodified lines
19 19
20TCC = $(TOP)/tcc $(TCCFLAGS)20TCC = $(TOP)/tcc $(TCCFLAGS)
21 21
22ifdef CONFIG_WIN32
23 TCC = $(top_srcdir)/win32/tcc $(TCCFLAGS)
24endif
25
22TESTS = $(patsubst %.c,%.test,$(wildcard *.c))26TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
23 27
24# 34_array_assignment.test -- array assignment is not in C standard28# 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