about summary refs log tree commit diff
path: root/src/etc/combine-tests.py
diff options
context:
space:
mode:
authorAdrien Tétar <adri-from-59@hotmail.fr>2014-02-02 11:47:02 +0100
committerAdrien Tétar <adri-from-59@hotmail.fr>2014-02-05 19:53:53 +0100
commit0ebe112b3bd137ec0363d47caad4ea80ad328717 (patch)
tree9c64acbafde92f0a30d5f6d1341bbe8058ef7cba /src/etc/combine-tests.py
parentfc1d655ed29a6ead06dfccece1b585e2c4212e16 (diff)
downloadrust-0ebe112b3bd137ec0363d47caad4ea80ad328717.tar.gz
rust-0ebe112b3bd137ec0363d47caad4ea80ad328717.zip
etc: add missing license boilerplates
Diffstat (limited to 'src/etc/combine-tests.py')
-rwxr-xr-xsrc/etc/combine-tests.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py
index 457c0b683ac..f1ac3e89846 100755
--- a/src/etc/combine-tests.py
+++ b/src/etc/combine-tests.py
@@ -1,7 +1,14 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
-# this combines all the working run-pass tests into a single large crate so we
+# This combines all the working run-pass tests into a single large crate so we
 # can run it "fast": spawning zillions of windows processes is our major build
 # bottleneck (and it doesn't hurt to run faster on other platforms as well).