summaryrefslogtreecommitdiff
path: root/snappy-test.cc
diff options
context:
space:
mode:
authorsnappy.mirrorbot@gmail.com <snappy.mirrorbot@gmail.com@03e5f5b5-db94-4691-08a0-1a8bf15f6143>2013-01-06 19:21:26 +0000
committersnappy.mirrorbot@gmail.com <snappy.mirrorbot@gmail.com@03e5f5b5-db94-4691-08a0-1a8bf15f6143>2013-01-06 19:21:26 +0000
commit2f74bc6e350a83e5568c961b9a6505ae2015aea9 (patch)
tree7acd77f25a472aab13e9531a7953275deee7ae05 /snappy-test.cc
parentf1d5be35642968c2e5b1eb729d619ea38b915abc (diff)
downloadsnappy-2f74bc6e350a83e5568c961b9a6505ae2015aea9.tar.gz
Adjust the Snappy open-source distribution for the changes in Google's
internal file API. R=sanjay git-svn-id: http://snappy.googlecode.com/svn/trunk@70 03e5f5b5-db94-4691-08a0-1a8bf15f6143
Diffstat (limited to 'snappy-test.cc')
-rw-r--r--snappy-test.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/snappy-test.cc b/snappy-test.cc
index 6a0611e..487b29c 100644
--- a/snappy-test.cc
+++ b/snappy-test.cc
@@ -46,10 +46,13 @@ string ReadTestDataFile(const string& base) {
string contents;
const char* srcdir = getenv("srcdir"); // This is set by Automake.
if (srcdir) {
- File::ReadFileToStringOrDie(
- string(srcdir) + "/testdata/" + base, &contents);
+ file::ReadFileToString(string(srcdir) + "/testdata/" + base,
+ &contents,
+ file::Defaults()).CheckSuccess();
} else {
- File::ReadFileToStringOrDie("testdata/" + base, &contents);
+ file::ReadFileToString("/testdata/" + base,
+ &contents,
+ file::Defaults()).CheckSuccess();
}
return contents;
}