[asterisk-commits] tilghman: trunk r243077 - /trunk/tests/test_substitution.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan 25 19:56:24 2010
New Revision: 243077

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243077
Log:
Fixing last errors in the conversion, though it appears that the AES_* functions are still broken.

Modified:
    trunk/tests/test_substitution.c

Modified: trunk/tests/test_substitution.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_substitution.c?view=diff&rev=243077&r1=243076&r2=243077
==============================================================================
--- trunk/tests/test_substitution.c (original)
+++ trunk/tests/test_substitution.c Mon Jan 25 19:56:24 2010
@@ -211,7 +211,7 @@
 
 	ast_test_status_update(&args->status_update, "Testing variable substitution ...\n");
 
-	c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Test/substitution");
+	c = ast_channel_alloc(0, 0, "", "", "", "", "", "", 0, "Test/substitution");
 
 #define TEST(t) if (t == AST_TEST_FAIL) { res = AST_TEST_FAIL; }
 	TEST(test_chan_integer(&args->status_update, &args->ast_test_error_str, c, &c->cid.cid_pres, "${CALLINGPRES}"));
@@ -263,15 +263,15 @@
 			if (acf->read && acf->read2) {
 				char expression[80];
 				snprintf(expression, sizeof(expression), "${%s(foo)}", cmd);
-				res = test_chan_function(&args->status_update,
-						&args->ast_test_error_str,c, expression);
+				if (AST_TEST_FAIL == test_chan_function(&args->status_update, &args->ast_test_error_str,c, expression)) {
+					res = AST_TEST_FAIL;
+				}
 			}
 		}
 		ast_free(cmd);
 	}
 
 	ast_hangup(c);
-
 	return res;
 }