kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 06:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary rebuilds of main/test.c.

Browse Source 
main/test.c includes "asterisk/version.h", when it should include
"asterisk/ast_version.h" instead (and it should use the ast_get_version()
and ast_get_version_num() functions). This commit modifies it to extract
the Asterisk version information using the proper APIs, and as a result means
that main/test.c no longer needs to be rebuilt when a Subversion checkout
is updated or modified.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@352612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2012-01-25 21:16:54 +00:00
parent 054c466a2f
commit d4dc9894f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/test.c
View File

@@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
#include "asterisk/utils.h" #include "asterisk/utils.h"
#include "asterisk/cli.h" #include "asterisk/cli.h"
#include "asterisk/term.h" #include "asterisk/term.h"
#include "asterisk/version.h" #include "asterisk/ast_version.h"
#include "asterisk/paths.h" #include "asterisk/paths.h"
#include "asterisk/time.h" #include "asterisk/time.h"
#include "asterisk/manager.h" #include "asterisk/manager.h"
@@ -386,14 +386,14 @@ static int test_generate_results(const char *name, const char *category, const c
last_results.total_time / 1000, last_results.total_time % 1000, last_results.total_time / 1000, last_results.total_time % 1000,
last_results.total_tests); last_results.total_tests);
fprintf(f_xml, "\t<properties>\n"); fprintf(f_xml, "\t<properties>\n");
fprintf(f_xml, "\t\t<property name=\"version\" value=\"%s\"/>\n", ASTERISK_VERSION); fprintf(f_xml, "\t\t<property name=\"version\" value=\"%s\"/>\n", ast_get_version());
fprintf(f_xml, "\t</properties>\n"); fprintf(f_xml, "\t</properties>\n");
} }
/* txt header information */ /* txt header information */
if (f_txt) { if (f_txt) {
fprintf(f_txt, "Asterisk Version: %s\n", ASTERISK_VERSION); fprintf(f_txt, "Asterisk Version: %s\n", ast_get_version());
fprintf(f_txt, "Asterisk Version Number: %d\n", ASTERISK_VERSION_NUM); fprintf(f_txt, "Asterisk Version Number: %s\n", ast_get_version_num());
fprintf(f_txt, "Number of Tests: %d\n", last_results.total_tests); fprintf(f_txt, "Number of Tests: %d\n", last_results.total_tests);
fprintf(f_txt, "Number of Tests Executed: %d\n", (last_results.total_passed + last_results.total_failed)); fprintf(f_txt, "Number of Tests Executed: %d\n", (last_results.total_passed + last_results.total_failed));
fprintf(f_txt, "Passed Tests: %d\n", last_results.total_passed); fprintf(f_txt, "Passed Tests: %d\n", last_results.total_passed);