Commit 8fff598c authored by Ian Craggs's avatar Ian Craggs

Latest test changes

parent 72d05f95
...@@ -2737,7 +2737,7 @@ MQTTAsync_nameValue* MQTTAsync_getVersionInfo() ...@@ -2737,7 +2737,7 @@ MQTTAsync_nameValue* MQTTAsync_getVersionInfo()
int i = 0; int i = 0;
libinfo[i].name = "Product name"; libinfo[i].name = "Product name";
libinfo[i++].value = "Asynchronous MQTT C Client Library"; libinfo[i++].value = "Paho Asynchronous MQTT C Client Library";
libinfo[i].name = "Version"; libinfo[i].name = "Version";
libinfo[i++].value = CLIENT_VERSION; libinfo[i++].value = CLIENT_VERSION;
......
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
#endif #endif
#define URI_TCP "tcp://" #define URI_TCP "tcp://"
#define BUILD_TIMESTAMP "##MQTTCLIENT_BUILD_TAG##" #define BUILD_TIMESTAMP "##MQTTCLIENT_BUILD_TAG##"
#define CLIENT_VERSION "##MQTTCLIENT_VERSION_TAG##" #define CLIENT_VERSION "##MQTTCLIENT_VERSION_TAG##"
char* client_timestamp_eye = "MQTTClientV3_Timestamp " BUILD_TIMESTAMP; char* client_timestamp_eye = "MQTTClientV3_Timestamp " BUILD_TIMESTAMP;
char* client_version_eye = "MQTTClientV3_Version " CLIENT_VERSION; char* client_version_eye = "MQTTClientV3_Version " CLIENT_VERSION;
...@@ -1725,14 +1725,17 @@ exit: ...@@ -1725,14 +1725,17 @@ exit:
MQTTClient_nameValue* MQTTClient_getVersionInfo() MQTTClient_nameValue* MQTTClient_getVersionInfo()
{ {
#define MAX_INFO_STRINGS 7 #define MAX_INFO_STRINGS 8
static MQTTClient_nameValue libinfo[MAX_INFO_STRINGS + 1]; static MQTTClient_nameValue libinfo[MAX_INFO_STRINGS + 1];
int i = 0; int i = 0;
libinfo[i].name = "version"; libinfo[i].name = "Product name";
libinfo[i++].value = "Paho Synchronous MQTT C Client Library";
libinfo[i].name = "Version";
libinfo[i++].value = CLIENT_VERSION; libinfo[i++].value = CLIENT_VERSION;
libinfo[i].name = "build level"; libinfo[i].name = "Build level";
libinfo[i++].value = BUILD_TIMESTAMP; libinfo[i++].value = BUILD_TIMESTAMP;
#if defined(OPENSSL) #if defined(OPENSSL)
libinfo[i].name = "OpenSSL version"; libinfo[i].name = "OpenSSL version";
......
...@@ -1482,8 +1482,7 @@ int main(int argc, char** argv) ...@@ -1482,8 +1482,7 @@ int main(int argc, char** argv)
fprintf(xml, "<testsuite name=\"test3\" tests=\"%d\">\n", ARRAY_SIZE(tests) - 1); fprintf(xml, "<testsuite name=\"test3\" tests=\"%d\">\n", ARRAY_SIZE(tests) - 1);
setenv("MQTT_C_CLIENT_TRACE", "ON", 1); setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
//setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 1); setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 1);
//setenv("MQTT_C_CLIENT_TRACE_LEVEL", "PROTOCOL", 1);
getopts(argc, argv); getopts(argc, argv);
if (options.test_no == 0) if (options.test_no == 0)
{ /* run all the tests */ { /* run all the tests */
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment