about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-01 11:10:35 -0700
committerbors <bors@rust-lang.org>2013-08-01 11:10:35 -0700
commit479809a267dbbcc3e2ec87da677c63430d3d229a (patch)
treeae94cb341c81d8d4abe38668e4e369613544b672
parent7daea7c9c107238ba7bfc2e9f0e8955d42ad71ed (diff)
parent0e2a0863507783d552ae6816bb4b0f061494c6b9 (diff)
downloadrust-479809a267dbbcc3e2ec87da677c63430d3d229a.tar.gz
rust-479809a267dbbcc3e2ec87da677c63430d3d229a.zip
auto merge of #8166 : emillon/rust/clean-tests-mk, r=brson
Hello,

While looking at `tests.mk` I noticed two errors:

  - there's a `srcrustllvm` instead of `src/rustllvm`
  - some filtered out files don't exist anymore

These two commits fix these issues. Thanks!
-rw-r--r--mk/tests.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/mk/tests.mk b/mk/tests.mk
index 048dc56597a..3ffe029d816 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -215,25 +215,20 @@ else
 ALL_CS := $(wildcard $(S)src/rt/*.cpp \
                      $(S)src/rt/*/*.cpp \
                      $(S)src/rt/*/*/*.cpp \
-                     $(S)srcrustllvm/*.cpp)
-ALL_CS := $(filter-out $(S)src/rt/bigint/bigint_ext.cpp \
-                       $(S)src/rt/bigint/bigint_int.cpp \
-                       $(S)src/rt/miniz.cpp \
+                     $(S)src/rustllvm/*.cpp)
+ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
                        $(S)src/rt/linenoise/linenoise.c \
                        $(S)src/rt/linenoise/utf8.c \
 	,$(ALL_CS))
 ALL_HS := $(wildcard $(S)src/rt/*.h \
                      $(S)src/rt/*/*.h \
                      $(S)src/rt/*/*/*.h \
-                     $(S)srcrustllvm/*.h)
+                     $(S)src/rustllvm/*.h)
 ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
                        $(S)src/rt/vg/memcheck.h \
-                       $(S)src/rt/uthash/uthash.h \
-                       $(S)src/rt/uthash/utlist.h \
                        $(S)src/rt/msvc/typeof.h \
                        $(S)src/rt/msvc/stdint.h \
                        $(S)src/rt/msvc/inttypes.h \
-                       $(S)src/rt/bigint/bigint.h \
                        $(S)src/rt/linenoise/linenoise.h \
                        $(S)src/rt/linenoise/utf8.h \
 	,$(ALL_HS))