From: Elliott Hughes <enh@google.com>
Date: Sun, 24 Apr 2016 16:41:27 +0000 (+0000)
Subject: Merge remote-tracking branch \'toybox/master\' into HEAD am: 1fdd927
X-Git-Tag: android-x86-7.1-r1~6^2~41
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc49e7d;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \'toybox/master\' into HEAD am: 1fdd927
am: 94694dd

* commit '94694dda30203290085c3f601b4c360ce99d4c80':
  Fix more to not append an extra newline.
  Fix more to a non-tty.
  Remove inappropriate bzip tests (we're not comparing with random "host version") replace with testing 2 known files out of blkid tests, and add badcrc test.
  Fiz bzcat segfault reported by John Regehr (bad crc didn't set error message).
  Allow EVAL= to run test under a different shell (for sh.test)
  Have dirtree_recurse() take the new dirfd as an argument.
  Fix touch -t seconds parsing

Change-Id: Ib09dafbf854fe6955918ed82f259f953f67430cd
---

dc49e7d71fb9d623c35e8dac4d3c6f15c81dabc6