@@ -32,7 +32,6 @@ void log_success() {

 int pam_sm_setcred_returns_success() {

     //given

-    reset_vars();

     //when

     int result = pam_sm_setcred(NULL, 0, 0, NULL);

@@ -43,7 +42,7 @@ int pam_sm_setcred_returns_success() {

 int pam_sm_authenticate_success_invokes_log_success() {

     // given

-    reset_vars();

+    validation_to_return = 1;

     log_success_invoked = 0;

     //when

@@ -53,7 +52,6 @@ int pam_sm_authenticate_success_invokes_log_success() {

 int succeeds_with_valid_token() {

     //given

-    reset_vars();

     //when

     int result = pam_sm_authenticate(NULL, 0, 0, NULL);

@@ -64,7 +62,6 @@ int succeeds_with_valid_token() {

 int fails_with_invalid_token() {

     //given

-    reset_vars();

     validation_to_return = 0;

     //when

@@ -83,12 +80,6 @@ int runtests() {

 }

 int main(int argc, char* argv[]) {

-//    check(pam_sm_setcred_returns_success(), "set cred failed\n");

-//    check(pam_sm_authenticate_success_invokes_log_success(), "authenticate invokes log_success failed\n");

-//    check(succeeds_with_valid_token(), "succeeds with valid token failed\n");

-//    check(fails_with_invalid_token(), "fails with invalid token failed\n")

-

    return !runtests();

-

 }

@@ -13,9 +13,15 @@

 #define checkstr(expected, actual, name) \

     check(!strcmp(actual, expected), name " should be '" expected "'")

+#ifdef reset_vars

+#define _reset reset_vars()

+#else

+#define _reset

+#endif

+

 #define test(NAME) \

     { \

-    fprintf(stderr, "here %s\n", #NAME); \

+      _reset \

       int result = NAME (); \

       if (!result) { \

           fprintf(stderr, "test failed: %s\n", #NAME); \