Skip to content

Commit

Permalink
auto merge of rust-lang#8166 : emillon/rust/clean-tests-mk, r=brson
Browse files Browse the repository at this point in the history
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!
  • Loading branch information
bors committed Aug 1, 2013
2 parents 7daea7c + 0e2a086 commit 479809a
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions mk/tests.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 479809a

Please sign in to comment.