Use OS X 10.1 image for Travis testing
parent
8c4f38b27d
commit
5124ff7b20
|
|
@ -8,7 +8,7 @@ dist: xenial
|
|||
sudo: required
|
||||
|
||||
# OS X only supports one image. Use the latest.
|
||||
osx_image: xcode9.4
|
||||
osx_image: xcode10.1
|
||||
|
||||
git:
|
||||
depth: 3
|
||||
|
|
|
|||
2
bench.h
2
bench.h
|
|
@ -37,7 +37,7 @@ extern const byte defaultKey[];
|
|||
extern time_t g_testBegin;
|
||||
extern time_t g_testEnd;
|
||||
|
||||
// Command handler
|
||||
// Benchmark command handler
|
||||
void BenchmarkWithCommand(int argc, const char* const argv[]);
|
||||
// Top level, prints preamble and postamble
|
||||
void Benchmark(Test::TestClass suites, double t, double hertz);
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ inline T StringToValue(const std::string& str)
|
|||
iss >> std::noskipws >> value;
|
||||
|
||||
// Use fail(), not bad()
|
||||
if (iss.fail() || !iss.eof())
|
||||
if (iss.fail())
|
||||
throw InvalidArgument(str + "' is not a value");
|
||||
|
||||
if (NON_NEGATIVE && value < 0)
|
||||
|
|
@ -254,6 +254,8 @@ inline std::string AddSeparator(std::string str)
|
|||
return str;
|
||||
}
|
||||
|
||||
// Ideally we would cache the directory and just add the prefix
|
||||
// to subsequent calls, but ... Static Initialization Order Fiasco
|
||||
inline std::string DataDir(const std::string& filename)
|
||||
{
|
||||
std::string name;
|
||||
|
|
|
|||
Loading…
Reference in New Issue