diff options
| author | Erlang/OTP <[email protected]> | 2010-01-31 07:18:55 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-01-31 08:28:58 +0100 |
| commit | 07bf3fd306d7757d378a30dafee10e1adf19f376 (patch) | |
| tree | 130b7bec320b702b43eb58c78ee814b15936807a /lib/kernel/test/Makefile | |
| parent | d91db9e12b15a821592aa95de39c47e5ad2923ab (diff) | |
| parent | a656a27d520cec163aa99fbec583ba7a30a4f72e (diff) | |
| download | otp-07bf3fd306d7757d378a30dafee10e1adf19f376.tar.gz otp-07bf3fd306d7757d378a30dafee10e1adf19f376.tar.bz2 otp-07bf3fd306d7757d378a30dafee10e1adf19f376.zip | |
Merge branch 'bg/cleanup-tests' into ccase/r13b04_dev
* bg/cleanup-tests:
file_SUITE: eliminate a warning for an unused variable
kernel tests: modernize guard tests
unicode_SUITE: replace deprecated concat_binary/1 with list_to_binary/1
stdlib tests: modernize guard tests
Test suites: fix creation of Emakefiles
Diffstat (limited to 'lib/kernel/test/Makefile')
| -rw-r--r-- | lib/kernel/test/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile index ffad998d96..293c368e2a 100644 --- a/lib/kernel/test/Makefile +++ b/lib/kernel/test/Makefile @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 1997-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 1997-2010. All Rights Reserved. +# # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% # include $(ERL_TOP)/make/target.mk @@ -116,7 +116,7 @@ EBIN = . make_emakefile: $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \ - >> $(EMAKEFILE) + > $(EMAKEFILE) $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \ >> $(EMAKEFILE) |