[commit: ghc] wip/nfs-locking: Merge pull request #151 from ndmitchell/master (5f80d4f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f80d4f2a5269a8546a5040edbd26502fab7bc26/ghc

>---------------------------------------------------------------

commit 5f80d4f2a5269a8546a5040edbd26502fab7bc26
Merge: 754ed41 c5cb061
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jan 11 14:29:39 2016 +0000

    Merge pull request #151 from ndmitchell/master
    
    Add tests



>---------------------------------------------------------------

5f80d4f2a5269a8546a5040edbd26502fab7bc26
 .appveyor.yml               |  1 +
 .travis.yml                 |  1 +
 shaking-up-ghc.cabal        |  3 +++
 src/Main.hs                 |  4 +++-
 src/Settings/Builders/Ar.hs | 16 ++++------------
 src/Test.hs                 | 28 ++++++++++++++++++++++++++++
 src/Way.hs                  |  2 +-
 7 files changed, 41 insertions(+), 14 deletions(-)