History

Revert "Fix tests Makefiles on Windows"

This reverts commit fa2472c17246206ce6947475782de17245eceeea.

Vlad Vissoultchev committed 10 years ago

Commit acc8f601 parent f021a7c3 files · +2 −14Browse files

Unified · Split

3 files
  1. tests/Makefile +1 −2
  2. tests/pp/Makefile +1 −8
  3. tests/tests2/Makefile +0 −4
tests/Makefile+1−2
@@ -60,13 +60,12 @@ 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)
6463 ifdef CONFIG_WIN32
6564 TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
66− TCC = $(TOP)/win32/tcc $(TCCFLAGS)
6765 endif
6866 XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include
6967
68+TCC = $(TOP)/tcc $(TCCFLAGS)
7069 RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS)
7170
7271 DISAS = objdump -d
tests/pp/Makefile+1−8
@@ -2,17 +2,10 @@ · 1 unmodified line
22 # credits: 01..13.c from the pcc cpp-tests suite
33 #
44
5−TOP = ../..
6−include $(TOP)/Makefile
7−
8−TCC = $(TOP)/tcc
5+TCC = ../../tcc
96 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
107 TESTS += $(patsubst %.S,%.test,$(wildcard *.S))
118
12−ifdef CONFIG_WIN32
13− TCC = $(top_srcdir)/win32/tcc
14−endif
15−
169 all test : $(TESTS)
1710
1811 %.test: %.c %.expect
tests/tests2/Makefile+0−4
@@ -19,10 +19,6 @@ 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−
2622 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
2723
2824 # 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