From b3d2d92c81f75e7261c4ecc24a6ce3795fb7e0fb Mon Sep 17 00:00:00 2001 From: Chris Oei Date: Mon, 3 Sep 2012 12:54:51 -0700 Subject: [PATCH] Add more tests to test script --- main.c | 2 ++ test/keyfile1.dat | 1 + test/test.bash | 8 +++++++- test/test_results.reference | 9 +++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 test/keyfile1.dat create mode 100644 test/test_results.reference diff --git a/main.c b/main.c index d4b4ba2..bc244aa 100644 --- a/main.c +++ b/main.c @@ -42,6 +42,8 @@ usage(void) fprintf(stderr, "usage: scrypt-genpass [-m MAXMEM] [-o MAXOPS] [-k KEYFILE] [-p PASS] \n"); + fprintf(stderr, + " scrypt-genpass -t\n"); exit(1); } diff --git a/test/keyfile1.dat b/test/keyfile1.dat new file mode 100644 index 0000000..0c00383 --- /dev/null +++ b/test/keyfile1.dat @@ -0,0 +1 @@ +def \ No newline at end of file diff --git a/test/test.bash b/test/test.bash index 99d73aa..61ea317 100755 --- a/test/test.bash +++ b/test/test.bash @@ -1,5 +1,11 @@ #!/bin/bash PROG=./scrypt-genpass +RESULTS=test/test_results.log -$PROG -t +$PROG -t > $RESULTS 2>&1 +$PROG -h >> $RESULTS 2>&1 +$PROG -p b a >> $RESULTS 2>&1 +$PROG -k test/keyfile1.dat -p abc ghi >> $RESULTS 2>&1 + +diff $RESULTS test/test_results.reference diff --git a/test/test_results.reference b/test/test_results.reference new file mode 100644 index 0000000..e1561a3 --- /dev/null +++ b/test/test_results.reference @@ -0,0 +1,9 @@ +All internal tests pass +usage: scrypt-genpass [-m MAXMEM] [-o MAXOPS] [-k KEYFILE] [-p PASS] + scrypt-genpass -t +Master hex: 3e23e8160039594a33894f6564e1b1348bbd7a0088d42c4acb73eeaed59c009d +Site hex: ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb +Pass hex: 0160b45a147d0a0f5b6976a7ab698554a41c06c5f77cc9d77b06304265d1646fdc8e3119474748778ab3b68a39d0a67b3a92b41a8ddb45d4bb6ebec20a5f4a57 +Master hex: bef57ec7f53a6d40beb640a780a639c83bc29ac8a9816f1fc6c5c6dcd93c4721 +Site hex: 50ae61e841fac4e8f9e40baf2ad36ec868922ea48368c18f9535e47db56dd7fb +Pass hex: a46a99d8d0ed2388d48cc3ddd33efe0b635790176c4f84387c0b02b589d2db9703db2fa3d41d5ee1d670ba0ddd1cfd1520a0d1a7394db5ff5eaa8b290aa80ebd