Commit Graph

579 Commits

Author SHA1 Message Date
Prabhjyot Singh Sodhi
20a589c974 servo: Merge #5011 - changin os.exit to sys.exit (from psdh:ossys); r=Manishearth
Fixes #5009

Source-Repo: https://github.com/servo/servo
Source-Revision: a5f52bf086fcb4ec4c3d22917b928ebd0997ff84
2015-02-21 13:42:45 -07:00
Manish Goregaokar
ec73aa2e35 servo: Merge #4991 - Add ./mach build-gonk; unbreak gonk build; document (from Manishearth:gonkup); r=larsbergstrom
r? @larsbergstrom

cc @mwu

Source-Repo: https://github.com/servo/servo
Source-Revision: d326e75c5e0314903ed2d297dcb72e535c543c2f
2015-02-20 22:27:49 -07:00
Prabhjyot Singh Sodhi
54412d02e1 servo: Merge #4992 - ./mach cargo now cd's to servo dir if in root (from psdh:cargodir); r=Manishearth
Fixes #4976

Source-Repo: https://github.com/servo/servo
Source-Revision: ff10deb81415d2d1822166d1c0ca0d9f484f48c6
2015-02-20 16:24:53 -07:00
awlnx
e32dbab688 servo: Merge #4958 - fixes issue #4103 (from awlnx:master); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bc0e13a46db491b778f2ec47782d03282775eedc
2015-02-20 14:33:54 -07:00
Prabhjyot Singh Sodhi
ad2888040e servo: Merge #4930 - Mach bootstrapping will sync modules (from psdh:sync); r=Manishearth
Fixes #4916

Source-Repo: https://github.com/servo/servo
Source-Revision: 5622366bc5d40e387114ad51fdfb3a321772351d
2015-02-18 13:18:50 -07:00
Prabhjyot Singh Sodhi
6f70b0d192 servo: Merge #4877 - improving mach run error message in case of missing binaries (from psdh:imperror); r=jdm
#4874

Source-Repo: https://github.com/servo/servo
Source-Revision: b70e3cc5be5474cf3e45b7db251cf1ee494e26f1
2015-02-18 11:33:55 -07:00
awlnx
62c6722c62 servo: Merge #4913 - Added cleaning of packages to mach (from awlnx:master); r=jdm
issue #4898

Source-Repo: https://github.com/servo/servo
Source-Revision: c0e2a237ec14d1aaecc5240e7ebb8f324c946834
2015-02-13 06:15:48 -07:00
Prabhjyot Singh Sodhi
978ecd8d53 servo: Merge #4851 - adding --release flag to mach run command (from psdh:release); r=mbrubeck
#4834

Source-Repo: https://github.com/servo/servo
Source-Revision: 149053c2a770f919538133350f9398510c998bcf
2015-02-05 13:18:47 -07:00
Maciej Skrzypkowski
362e77800c servo: Merge #4816 - Added "-j" flag usage for building OpenSSL for android (from mskrzypkows:mskrzypkows_b); r=jdm
Sorry again the same pull request because I accidentally removed commit from branch.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3da41c2b16d84a8eb4c616b50124afd1252d1123
2015-02-03 07:09:52 -07:00
Manish Goregaokar
dcf80f334d servo: Merge #4813 - Fix the fix of the fix for fixing docs (from Manishearth:fix-fix-fix-doc); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 4622961d01533fbc9c310c485c98546724be0eea
2015-02-03 04:21:50 -07:00
Manish Goregaokar
8537b72ab0 servo: Merge #4812 - Fix the fix for doc upload (from Manishearth:doc-fix-fix); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ff53354ba7716fadc7656891d7b0723a3730e890
2015-02-03 03:27:51 -07:00
Manish Goregaokar
0a94d74e8c servo: Merge #4805 - Fix doc upload (from Manishearth:doc-upload); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 68ceb6323172ad1b914064cdc496f4c3a2699f76
2015-02-02 14:54:52 -07:00
Glenn Watson
7776eb3879 servo: Merge #4798 - Remove the glfw port (it doesn't compile since last rustup anyway) (from glennw:remove-glfw); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 896cdcb96a98d4b4858d24806ee67db6f63c9fb1
2015-02-02 01:30:50 -07:00
Matt Brubeck
da246a4107 servo: Merge #4755 - Move snapshot dir inside the source dir by default (from mbrubeck:cache-dir); r=metajack
As discussed in a previous weekly meeting, this avoids changing any directories outside the repo, which is better for some automation scenarios.

The servobuild.example file has a "cache-dir" setting that restores the previous default location of `~/.servo`, which is useful for developers working with multiple clones on the same machine.

I'm not sure which setting we want to use for our buildbot hosts.

r? @metajack or @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 74e32d119c864f527510a3ca008f88c26818df0b
2015-01-28 16:06:52 -07:00
Josh Matthews
b11f7d94dc servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Glenn Watson
f94c8edec9 servo: Merge #4707 - Change glutin headless mode to be a build config, as it breaks some Linux distros linking to both (from glennw:split-headless); r=larsbergstrom
The majority of this change is simply re-arranging the code in the glutin port so that the windowed/headless code is configured at build time rather than runtime. There shouldn't be any functional difference as a result of this change.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1b496d80dec4f202e0f318ee60ac156ad74256ff
2015-01-22 14:48:48 -07:00
Glenn Watson
38d15b4315 servo: Merge #4672 - Switch the default windowing system to glutin. See below for details (from glennw:make-glutin-default); r=larsbergstrom
This change makes glutin the default windowing system on mac/linux.

If you run into any issues with the glutin system, you can temporarily
build the GLFW system with the following command:

cd components/servo
../../mach cargo build --no-default-features --features=glfw

Once any glutin related issues have been sorted out, the GLFW
port will be removed.

Source-Repo: https://github.com/servo/servo
Source-Revision: ccf5f96fa91540ca73cfb24dd130d5124975fc6e
2015-01-19 16:30:47 -07:00
Ms2ger
f59ae9c05a servo: Merge #4662 - Disallow lines that span more than 160 columns (from Ms2ger:overlong); r=larsbergstrom
The Rust style guide suggests 100, but we have too many violations in the
tree already. This check can be tightened over time.

Source-Repo: https://github.com/servo/servo
Source-Revision: ee94b3e8bf659c847bda967700272f8f98fdb0cc
2015-01-19 08:33:48 -07:00
Glenn Watson
81653d18b6 servo: Merge #4581 - Update android openssl version due to security advisory https://www.openssl.org/news/secadv_20150108.txt (from glennw:openssl-update); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 78798026ac245187f92d7d3f88f7fe012c63ff9d
2015-01-08 17:15:50 -07:00
Ms2ger
b3c7f9d2ca servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Thomas Jespersen
84e9778ee4 servo: Merge #4549 - Check for no parameters when invoking cargo (from laumann:master); r=jdm
When invoking `./mach cargo` the following error appeared
```
Error running mach:

    ['cargo']

The error occurred in the implementation of the invoked mach command.

This should never occur and is likely a bug in the implementation of that
command. Consider filing a bug for this issue.

If filing a bug, please include the full output of mach, including this error
message.

The details of the failure are as follows:

TypeError: can only concatenate list (not "NoneType") to list

  File "/home/tj/servo/python/servo/devenv_commands.py", line 24, in cargo
    return subprocess.call(["cargo"] + params,
```
it seems to be that all that's missing is checking whether params is None or not.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3639c4e9818c5421659827b1da1844a9bbb792be
2015-01-05 08:36:53 -07:00
Ms2ger
c1b8a95d26 servo: Merge #4466 - Add a test that wptrunner fails when it should (from Ms2ger:failing-test); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: c92a7898b47ded1382221fc78526b87bfa9bd897
2014-12-23 05:36:44 -07:00
Matthew Rasmus
9a9af60d09 servo: Merge #4048 - Rebuild after ./mach test-unit (from mttr:mach_unit_test_fix); r=larsbergstrom
This is a quick and dirty workaround for issue #3928. Basically, `cargo test` is deleting `./target/servo`, which is clearly not ideal if we want to do anything with servo after running the unit tests. This PR makes sure to rebuild after running `./mach test-unit`.

I'm not familiar enough with cargo yet to know why it's doing this or what better alternatives there are to fixing this. Having to rebuild afterwards feels pretty ugly to me, but my rationalization right now is that the time it takes to build is negligible in comparison to the time it takes to run the tests. Ideally, this should be something we could take care of in Cargo.toml, but again, I'm new to this (and the documentation seems less than helpful from what I can tell so far).

I won't be available for the rest of the day, so if anyone has suggestions, or wants to wait for a better solution, I'll get back to it tomorrow probably. Otherwise, this PR at least makes `./mach test` work properly, so there's that.

Source-Repo: https://github.com/servo/servo
Source-Revision: f06e0a818db47ff872b98070077f274dbc7eb704
2014-12-22 14:05:34 -07:00
Simon Sapin
66d7332a20 servo: Merge #4420 - Fix warnings (from servo:fix-warnings); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: eea49ee1d986c306a8eec32b64be9b10cb2278fc
2014-12-18 04:42:50 -07:00
Glenn Watson
3f2a32f566 servo: Merge #4343 - Remove glut port now that android glutin has landed (from glennw:remove-glut); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 9f8dda7abc5f2dc97f5d90aa24fcc5b596ab6918
2014-12-11 19:42:55 -07:00
Glenn Watson
6b14b072a8 servo: Merge #4327 - Switch android to glutin (from glennw:glutin-android); r=larsbergstrom,larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 15187cb4512baa57902ac07fe902df14b3c99500
2014-12-11 17:09:54 -07:00
Glenn Watson
75fc135fe4 servo: Merge #4322 - Update ./mach update-cargo to include gonk Cargo.lock (from glennw:gonk-update-cargo); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 80756a11d2fc9dbc67eda580e7ed9c22b354647e
2014-12-10 18:21:54 -07:00
Patrick Walton
755e7a69c3 servo: Merge #4193 - ports/cef: Implement accelerated compositing for the CEF port (from pcwalton:cef-redux); r=pcwalton,metajack
@glennw, is it possible to rebase your stuff on top of this? Sorry for the mess.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: ba06d50e3a611d1c27c6c9aa0b21441282911c3f
2014-12-10 09:40:03 -07:00
Simon Sapin
7b2a0d58bd servo: Merge #4302 - Add a ./mach clean-snapshots command to remove old Cargo and Rust (from SimonSapin:clean-snapshots); r=Manishearth
Bootstrapping automatically downloads new Rust and Cargo snapshots as needed into versioned directories, but do not remove now-unused versions. This is the desired behavior for `git bisect` to be usable.

However, this means that old version keep accumulating, taking up disk space. This adds a mach command to remove snapshots other than the ones currently being used. It is never run automatically.

To be safe, the command defaults to only printing what would be removed, and only removes stuff when run with a `-f` argument.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: 00298221a6238c4fe4909f68a6616a718908ccf5
2014-12-09 04:01:19 -07:00
Glenn Watson
4e87a2eaa4 servo: Merge #4292 - Use mach to build openssl on android instead of glut makefile (from glennw:android-ssl); r=mbrubeck
The glut makefile will be removed shortly after glutin lands
for android, so we need to build openssl for android elsewhere
in the build process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2741fd2e139b9cb8e9f14857877f567ecae3bced
2014-12-08 17:54:57 -07:00
Matthew Rasmus
14c74f408d servo: Merge #4288 - Updates ./mach update-cargo for new path changes (from mttr:mach_update_cargo_fix); r=jdm
Also fixed a bug if run with no arguments.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1458bb439701274527308a29f2e5e65c3306f78a
2014-12-08 17:03:59 -07:00
Andreas Tolfsen
a00405b7d1 servo: Merge #4286 - Fix concatentation error on no args to ./mach rustc (from andreastt:ato/concat_error_on_system_rust); r=metajack
Since default argument to params is None, concatenating it with a
list will raise an error.  This behaviour prevents `./mach rustc`
to be called when system-rust is defined in .servobuild.

Currently it will only work when followed by an argument, i.e.
`./mach rustc -arg`.

Testing this patch: `./mach rustc` should not raise an error.

Source-Repo: https://github.com/servo/servo
Source-Revision: 35c13f07bfd6a8973399e75404fa61a6d9aeda00
2014-12-08 15:28:03 -07:00
Glenn Watson
1771b43728 servo: Merge #4207 - Fix path for CEF build (from glennw:fix-cef); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: ccef72385131f923edd63ffc586165aae786adf2
2014-12-07 15:25:07 -07:00
Matthew Rasmus
238e2c56d0 servo: Merge #4269 - Fix breakage of ./mach test (from mttr:mach_test_fix); r=mbrubeck
When running commands through Registrar.dispatch, mach does not behave
in the same way it would as if it were running through the command line.
Defaults normally provided through a combination of @CommandArgument and
argparse magic are ignored.

I have some ideas as to how to fix this, but until then, this will allow
`./mach test` to run through test-unit properly.

Source-Repo: https://github.com/servo/servo
Source-Revision: a6768b62446d599b23906eae08845dcb8bbe8853
2014-12-06 13:49:03 -07:00
Matthew Rasmus
8c45e48f2c servo: Merge #4229 - Adds a --component argument to test-unit (from mttr:mach_unit_test_select_component); r=Manishearth
Example usage:

`./mach test-unit -c style`

Source-Repo: https://github.com/servo/servo
Source-Revision: 2d0e96e1331668fea7313efd688fe7dba6d7ebed
2014-12-06 04:49:00 -07:00
Matthew Rasmus
37074dccaf servo: Merge #4231 - Mach test inference fix (from mttr:mach_test_fix); r=jdm
Somehow didn't catch this when renaming a variable.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1046839e8cbf049f13d465cf7137e501a83119b9
2014-12-05 03:13:09 -07:00
Manish Goregaokar
b0d21c9484 servo: Merge #4240 - Make tidy ingore new target dir (from Manishearth:tidy); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: a451a3bdb5bd37dc671dcb24b80f869ad6a82010
2014-12-05 00:49:10 -07:00
Simon Sapin
d6c18025eb servo: Merge #4203 - Make 'mach doc' not fail when components/servo/target doesn’t exist (from SimonSapin:refactor-doc); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: ad9aedac77d094b8524b6170b857499bdc9cd762
2014-12-03 19:09:58 -07:00
Simon Sapin
e8882a75b7 servo: Merge #4142 - Have mach doc copy Rust docs, add mach browse-doc (from SimonSapin:refactor-doc); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d1193547b3d6cb1f36edcd61ff0a2572a817bf8
2014-12-03 16:27:56 -07:00
Simon Sapin
d266298e25 servo: Merge #4140 - Move the root Cargo.toml to components/servo, and warn when Cargo is run directly (from SimonSapin:no-root-cargo-toml); r=SimonSapin
This fixes #3957, and allow #4115 not to regress #4099.

Source-Repo: https://github.com/servo/servo
Source-Revision: 873ca6cadddc1a40bead1f5dd0128bb16cfaa11b
2014-12-02 19:27:51 -07:00
Nathan Climer
3779001fc0 servo: Merge #4169 - Fixed test filter (from IdeaHat:fix-mach-unit-test-filter); r=jdm
Minor change, added unit test filter to components so that ./mach test-unit [test-filter] works in line with documentation.

I'd personally like to also make filters on the components as well as the tests. This would change the interface (probably to ./mach test-unit [component-filter] [test-filter]), but change is NOT in this pull request.

Source-Repo: https://github.com/servo/servo
Source-Revision: c91e949ed02dc299900ed2c50812d733e6740afb
2014-12-02 18:15:51 -07:00
Matthew Rasmus
b3a0be8a7b servo: Merge #4168 - infer_test_by_dir cleanup (from mttr:mach_inferred_test_cleanup); r=Manishearth
No actual change in functionality here. I was just unhappy with the way test-ref was singled out before, and realized an obvious fix.

Source-Repo: https://github.com/servo/servo
Source-Revision: 600da2af7e6c886f46d013008d2f933b99a2b92f
2014-12-02 15:42:53 -07:00
Matthew Rasmus
b8bfbb73bc servo: Merge #4093 - Adds explicit --name argument to test-ref (from mttr:mach_reftest_by_file); r=jdm
`./mach test-ref` no longer eats the first "-" prefixed argument for test name filtering, instead using an explicit "--name" argument. This should avoid any potential confusion when passing down arguments to servo.

Also allows for ./tests/ref to be included (and trimmed away) for tab completion convenience (`./mach test` has also been updated to take advantage of this when inferring tests from file paths).

(fixes #4091)

Source-Repo: https://github.com/servo/servo
Source-Revision: b87d98e468d6c405dd02625e3e223e2412db8610
2014-11-29 01:12:42 -07:00
Matt Murphy
e59d362cc8 servo: Merge #4135 - Fix error when executing "mach doc" (from murphm8:mach_doc); r=SimonSapin
This should fix  #4134

Source-Repo: https://github.com/servo/servo
Source-Revision: fafd3fd8ba6d2e43ad8cc34ac0f4cc9e835e6867
2014-11-28 08:54:45 -07:00
Matthew Rasmus
bcd520c3cb servo: Merge #4090 - Lets ./mach test infer testsuite from file/directory path (from mttr:mach_infer_test); r=jdm
Fixes #4086

Lets `./mach test` take a file or directory as an argument, and infers `test-content`, `test-wpt`, or `test-ref` from the file's path.

Usage Example:
```
$ ./mach test tests/wpt/web-platform-tests/dom/interfaces.html
 0:00.27 LOG: MainThread INFO Using 1 client processes
 ...
```
Note that while there is no functionality for `test-ref` to accept individual files, `./mach test tests/ref` will still trigger `test-ref`.

Passing arguments properly through python would have been ugly (though maybe there are some mach internals I could have taken advantage of), so this instead runs a new mach process and lets the individual test suites manage their arguments like normal.

Source-Repo: https://github.com/servo/servo
Source-Revision: 10f8fe00677c756bd69adcf90b96a7e36bae8f56
2014-11-24 13:42:39 -07:00
Matthew Rasmus
9308fac0de servo: Merge #4083 - Mach debugger flag (from mttr:mach_debugger_flag); r=mbrubeck
Borrows two python modules from mozilla-central to give mach the ability to detect and pass arguments to a system's preferred debugger, and adds `--debug` and `--debugger` flags to `./mach run`. This works almost like the functionality described [here](https://developer.mozilla.org/en-US/docs/Debugging_Mozilla_with_gdb), but at the moment it lacks a `--debugparams`  argument.

Links to borrowed files:
http://hg.mozilla.org/mozilla-central/file/c9cfa9b91dea/testing/mozbase/mozinfo/mozinfo/mozinfo.py
http://hg.mozilla.org/mozilla-central/file/c9cfa9b91dea/testing/mozbase/mozdebug/mozdebug/mozdebug.py

Source-Repo: https://github.com/servo/servo
Source-Revision: 989efd5a2820a152c5d5a2d42c9be3c30d79f469
2014-11-24 10:15:46 -07:00
Matthew Rasmus
d023dbc6df servo: Merge #4080 - Update mach to latest changes from mozilla-central (from mttr:mach_update); r=jdm
Updates the way mach mixes unrecognized arguments and predefined arguments (see [mozilla bug 1076649](https://bugzilla.mozilla.org/show_bug.cgi?id=1076649) for details on this change), and also adds support for argument groupings (see [1077272](https://bugzilla.mozilla.org/show_bug.cgi?id=1077272)).

I was running into some annoyances when trying to implement a change that would allow a `--debug` flag to be used in `./mach run` for running Servo through a debugger (basically, the same behavior described under "How do I run Mozilla under gdb?" [here](https://developer.mozilla.org/en-US/docs/Debugging_Mozilla_with_gdb)). This change should make those annoyances go away, and as far as I can tell, it doesn't have an impact on the way any of the existing commands are used.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4a257bc27152bef98068cfdc1433549aab05c5de
2014-11-23 22:48:32 -07:00
Matthew Rasmus
f65d1a40fa servo: Merge #4077 - Adds --release flag to ./mach build-cef (from mttr:mach_build_cef_release); r=kmcallister
Requested by kmc in IRC.

```
11:36 < kmc> while you're mach-ing about, can you modify build-cef to
accept --release like build does?
```

Source-Repo: https://github.com/servo/servo
Source-Revision: a1a268ce1d00c865f14ae76c1d767f905cfc3a92
2014-11-23 12:57:36 -07:00
Corey Farwell
07cf9fed05 servo: Merge #4072 - Make sure directories aren't getting tested (from frewsxcv:test-files); r=jdm
Fixes #3910

Source-Repo: https://github.com/servo/servo
Source-Revision: af42f1afc1dd2bcad50690c694c52b6b4f2d121a
2014-11-23 11:57:36 -07:00
nwin
824de84a6a servo: Merge #4075 - Fixes 4037. Enable backtrace on run cmd (from nwin:fix-4037); r=Ms2ger
Fixes #4037

Source-Repo: https://github.com/servo/servo
Source-Revision: 593e3bc40c8c135f4fa1f0c6e59c6159edd76d74
2014-11-23 09:33:36 -07:00