diff options
| author | David Phillips <david@sighup.nz> | 2017-11-23 23:36:53 +1300 |
|---|---|---|
| committer | David Phillips <david@sighup.nz> | 2017-11-23 23:36:53 +1300 |
| commit | 0add7dea6763ce192b8afe6cc07b5c10cbbd4507 (patch) | |
| tree | 641dd9070fc51da4b96e1a33ca9b8a138e31abed | |
| parent | 6765aabd66c8c396402d2572015a4172bc103d51 (diff) | |
| parent | f5ba8485c1614dc24270d1885fc3dbc1c4b288e5 (diff) | |
| download | sand-leek-0add7dea6763ce192b8afe6cc07b5c10cbbd4507.tar.xz | |
Merge branch 'master' into fancy-monitor
| -rw-r--r-- | sand-leek.c | 2 | ||||
| -rwxr-xr-x | test/002-test-key-name.test/run.sh | 2 | ||||
| -rw-r--r-- | test/003-test-invalid-char.test/stderr.expected | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sand-leek.c b/sand-leek.c index cdfcd3c..d18b806 100644 --- a/sand-leek.c +++ b/sand-leek.c @@ -419,7 +419,7 @@ main(int argc, char **argv) { for (i = 0; i < thread_count; i++) { iprintf("Spawning worker thread %d/%d ... ", i + 1, thread_count); - if (pthread_create(&workers[i], NULL, work, (void*)&khashes[i])) { /* FIXME not ! */ + if (pthread_create(&workers[i], NULL, work, (void*)&khashes[i])) { eprintf(""); perror("pthread_create"); free((unsigned long*)khashes); diff --git a/test/002-test-key-name.test/run.sh b/test/002-test-key-name.test/run.sh index f9fd5c3..f3ac770 100755 --- a/test/002-test-key-name.test/run.sh +++ b/test/002-test-key-name.test/run.sh @@ -8,7 +8,7 @@ stderr="$(mktemp)" # Four character search should be a < 1 second CPU burst for CI runner ${EXECUTABLE} -s site > $key 2>$stderr -found="$(tr '\r' '\n' < $stderr | grep Found | cut -d ' ' -f 2)" +found="$(tr '\r' '\n' < $stderr | grep Found | cut -d ' ' -f 3)" echo "sand-leek says it found $found..." diff --git a/test/003-test-invalid-char.test/stderr.expected b/test/003-test-invalid-char.test/stderr.expected index f1652b2..7602703 100644 --- a/test/003-test-invalid-char.test/stderr.expected +++ b/test/003-test-invalid-char.test/stderr.expected @@ -1,2 +1,3 @@ -Error: search contains non-base-32 character(s): 1 +[22m[36mINFO: [1;37mStarting sand-leek 0.5 +[22m[31mERROR: [1;37msearch contains non-base-32 character(s): 1 I cannot search for something that will never occur |