diff options
| author | Vlad Vissoultchev <wqweto@gmail.com> | 2016-04-17 16:20:46 +0300 |
|---|---|---|
| committer | Vlad Vissoultchev <wqweto@gmail.com> | 2016-04-17 17:24:17 +0300 |
| commit | acc8f602e57d69e6e36c417b7b360b6dd685b64e (patch) | |
| tree | c3b8c1e7fa57ee343389a3f6d77c89ed83a62d10 | |
| parent | f021a7cd94c7fff2e6959dc75c6e923a59f36637 (diff) | |
| download | tinycc-acc8f602e57d69e6e36c417b7b360b6dd685b64e.tar.gz tinycc-acc8f602e57d69e6e36c417b7b360b6dd685b64e.tar.bz2 | |
Revert "Fix tests Makefiles on Windows"
This reverts commit fa2472c17246206ce6947475782de17245eceeea.
| -rw-r--r-- | tests/Makefile | 3 | ||||
| -rw-r--r-- | tests/pp/Makefile | 9 | ||||
| -rw-r--r-- | tests/tests2/Makefile | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/tests/Makefile b/tests/Makefile index f556cc5..e9f173b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -60,13 +60,12 @@ endif # run local version of tcc with local libraries and includes TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP) -TCC = $(TOP)/tcc $(TCCFLAGS) ifdef CONFIG_WIN32 TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP) - TCC = $(TOP)/win32/tcc $(TCCFLAGS) endif XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include +TCC = $(TOP)/tcc $(TCCFLAGS) RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS) DISAS = objdump -d diff --git a/tests/pp/Makefile b/tests/pp/Makefile index d55699c..5694ebb 100644 --- a/tests/pp/Makefile +++ b/tests/pp/Makefile @@ -2,17 +2,10 @@ # credits: 01..13.c from the pcc cpp-tests suite # -TOP = ../.. -include $(TOP)/Makefile - -TCC = $(TOP)/tcc +TCC = ../../tcc TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) TESTS += $(patsubst %.S,%.test,$(wildcard *.S)) -ifdef CONFIG_WIN32 - TCC = $(top_srcdir)/win32/tcc -endif - all test : $(TESTS) %.test: %.c %.expect diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile index ab8b6c6..254fa5c 100644 --- a/tests/tests2/Makefile +++ b/tests/tests2/Makefile @@ -19,10 +19,6 @@ endif TCC = $(TOP)/tcc $(TCCFLAGS) -ifdef CONFIG_WIN32 - TCC = $(top_srcdir)/win32/tcc $(TCCFLAGS) -endif - TESTS = $(patsubst %.c,%.test,$(wildcard *.c)) # 34_array_assignment.test -- array assignment is not in C standard |