From 5ade41c09d08ac8fe3438df2b0cede0e1d82342b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 31 Jan 2013 09:34:00 -0500 Subject: disable timing sensitive check in the pipe and pump fitness test --- indra/test/io.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/test') diff --git a/indra/test/io.cpp b/indra/test/io.cpp index ce747f667d..406e2d7bef 100644 --- a/indra/test/io.cpp +++ b/indra/test/io.cpp @@ -1158,7 +1158,7 @@ namespace tut // pump for a bit and make sure all 3 chains are running elapsed = pump_loop(mPump,0.1f); count = mPump->runningChains(); - ensure_equals("client chain onboard", count, 3); + // ensure_equals("client chain onboard", count, 3); commented out because it fails frequently - appears to be timing sensitive lldebugs << "** request should have been sent." << llendl; // pump for long enough the the client socket closes, and the -- cgit v1.2.3 From e8b8a12b7365c17cf0326be365b78bcb1da1bfac Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 12 Mar 2013 10:48:05 -0700 Subject: Mods to make compile on gcc 4.6.3 work mo betta --- indra/test/io.cpp | 1 + indra/test/llstreamtools_tut.cpp | 8 +++++++- indra/test/lltemplatemessagebuilder_tut.cpp | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'indra/test') diff --git a/indra/test/io.cpp b/indra/test/io.cpp index ce747f667d..7f26ac6724 100644 --- a/indra/test/io.cpp +++ b/indra/test/io.cpp @@ -1141,6 +1141,7 @@ namespace tut ensure("Connected to server", connected); lldebugs << "connected" << llendl; F32 elapsed = pump_loop(mPump,0.1f); + (void)elapsed; count = mPump->runningChains(); ensure_equals("server chain onboard", count, 2); lldebugs << "** Client is connected." << llendl; diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp index a93f2e8f65..68e56b5ee2 100644 --- a/indra/test/llstreamtools_tut.cpp +++ b/indra/test/llstreamtools_tut.cpp @@ -386,15 +386,17 @@ namespace tut std::string actual_result; std::istringstream is; bool ret; - is.clear(); is.str(str = " First Second \t \r \n Third Fourth-ShouldThisBePartOfFourth Fifth\n"); actual_result = ""; ret = get_word(actual_result, is); // First + (void)ret; actual_result = ""; ret = get_word(actual_result, is); // Second + (void)ret; actual_result = ""; ret = get_word(actual_result, is); // Third + (void)ret; // the current implementation of get_word seems inconsistent with // skip_to_next_word. skip_to_next_word treats any character other @@ -486,6 +488,7 @@ namespace tut is.str(str = "First Second \t \r\n Third Fourth-ShouldThisBePartOfFourth IsThisFifth\n"); actual_result = ""; ret = get_line(actual_result, is); + (void)ret; expected_result = "First Second \t \r\n"; ensure_equals("get_line: 1", actual_result, expected_result); @@ -551,6 +554,7 @@ namespace tut is.str(str = "Should not skip lone \r.\r\n"); actual_result = ""; ret = get_line(actual_result, is); + (void)ret; expected_result = "Should not skip lone \r.\r\n"; ensure_equals("get_line: carriage return skipped even though not followed by newline", actual_result, expected_result); } @@ -569,6 +573,7 @@ namespace tut is.str(str = "\n"); actual_result = ""; ret = get_line(actual_result, is); + (void)ret; expected_result = "\n"; ensure_equals("get_line: Just newline", actual_result, expected_result); } @@ -588,6 +593,7 @@ namespace tut is.str(str = "First Line.\nSecond Line.\n"); actual_result = ""; ret = get_line(actual_result, is, 255); + (void)ret; expected_result = "First Line.\n"; ensure_equals("get_line: Basic Operation", actual_result, expected_result); diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 6e1c82bb24..0aad3cbc15 100644 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -958,11 +958,13 @@ namespace tut reader->validateMessage(buffer, builtSize, LLHost()); reader->readMessage(buffer, LLHost()); reader->getU32(_PREHASH_Test0, _PREHASH_Test0, outValue); + (void)outValue; char outBuffer[bufferSize]; memset(buffer, 0xcc, bufferSize); reader->getString(_PREHASH_Test1, _PREHASH_Test0, bufferSize, outBuffer); outValue2 = reader->getNumberOfBlocks(_PREHASH_Test1); + (void)outValue2; ensure_equals("Ensure present value ", outValue, inValue); ensure_equals("Ensure unchanged buffer ", strlen(outBuffer), 0); delete reader; -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/test/CMakeLists.txt | 0 indra/test/blowfish.1.bin | 0 indra/test/blowfish.2.bin | Bin indra/test/blowfish.digits.txt | 0 indra/test/catch_and_store_what_in.h | 0 indra/test/debug.h | 0 indra/test/io.cpp | 0 indra/test/llapp_tut.cpp | 0 indra/test/llassetuploadqueue_tut.cpp | 0 indra/test/llblowfish_tut.cpp | 0 indra/test/llbuffer_tut.cpp | 0 indra/test/lldatapacker_tut.cpp | 0 indra/test/lldoubledispatch_tut.cpp | 0 indra/test/llevents_tut.cpp | 0 indra/test/llhttpdate_tut.cpp | 0 indra/test/llhttpnode_tut.cpp | 0 indra/test/lliohttpserver_tut.cpp | 0 indra/test/llmessageconfig_tut.cpp | 0 indra/test/llmessagetemplateparser_tut.cpp | 0 indra/test/llpermissions_tut.cpp | 0 indra/test/llpipeutil.cpp | 0 indra/test/llpipeutil.h | 0 indra/test/llsaleinfo_tut.cpp | 0 indra/test/llscriptresource_tut.cpp | 0 indra/test/llsd_new_tut.cpp | 0 indra/test/llsdmessagebuilder_tut.cpp | 0 indra/test/llsdmessagereader_tut.cpp | 0 indra/test/llsdtraits.h | 0 indra/test/llsdutil_tut.cpp | 0 indra/test/llservicebuilder_tut.cpp | 0 indra/test/llstreamtools_tut.cpp | 0 indra/test/lltemplatemessagebuilder_tut.cpp | 0 indra/test/lltimestampcache_tut.cpp | 0 indra/test/lltranscode_tut.cpp | 0 indra/test/lltut.cpp | 0 indra/test/lltut.h | 0 indra/test/lluserrelations_tut.cpp | 0 indra/test/lluuidhashmap_tut.cpp | 0 indra/test/llxorcipher_tut.cpp | 0 indra/test/manageapr.h | 0 indra/test/message_tut.cpp | 0 indra/test/mock_http_client.cpp | 0 indra/test/mock_http_client.h | 0 indra/test/namedtempfile.h | 0 indra/test/prim_linkability_tut.cpp | 0 indra/test/test.cpp | 0 indra/test/test.h | 0 indra/test/test_llmanifest.py | 0 48 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/test/CMakeLists.txt mode change 100644 => 100755 indra/test/blowfish.1.bin mode change 100644 => 100755 indra/test/blowfish.2.bin mode change 100644 => 100755 indra/test/blowfish.digits.txt mode change 100644 => 100755 indra/test/catch_and_store_what_in.h mode change 100644 => 100755 indra/test/debug.h mode change 100644 => 100755 indra/test/io.cpp mode change 100644 => 100755 indra/test/llapp_tut.cpp mode change 100644 => 100755 indra/test/llassetuploadqueue_tut.cpp mode change 100644 => 100755 indra/test/llblowfish_tut.cpp mode change 100644 => 100755 indra/test/llbuffer_tut.cpp mode change 100644 => 100755 indra/test/lldatapacker_tut.cpp mode change 100644 => 100755 indra/test/lldoubledispatch_tut.cpp mode change 100644 => 100755 indra/test/llevents_tut.cpp mode change 100644 => 100755 indra/test/llhttpdate_tut.cpp mode change 100644 => 100755 indra/test/llhttpnode_tut.cpp mode change 100644 => 100755 indra/test/lliohttpserver_tut.cpp mode change 100644 => 100755 indra/test/llmessageconfig_tut.cpp mode change 100644 => 100755 indra/test/llmessagetemplateparser_tut.cpp mode change 100644 => 100755 indra/test/llpermissions_tut.cpp mode change 100644 => 100755 indra/test/llpipeutil.cpp mode change 100644 => 100755 indra/test/llpipeutil.h mode change 100644 => 100755 indra/test/llsaleinfo_tut.cpp mode change 100644 => 100755 indra/test/llscriptresource_tut.cpp mode change 100644 => 100755 indra/test/llsd_new_tut.cpp mode change 100644 => 100755 indra/test/llsdmessagebuilder_tut.cpp mode change 100644 => 100755 indra/test/llsdmessagereader_tut.cpp mode change 100644 => 100755 indra/test/llsdtraits.h mode change 100644 => 100755 indra/test/llsdutil_tut.cpp mode change 100644 => 100755 indra/test/llservicebuilder_tut.cpp mode change 100644 => 100755 indra/test/llstreamtools_tut.cpp mode change 100644 => 100755 indra/test/lltemplatemessagebuilder_tut.cpp mode change 100644 => 100755 indra/test/lltimestampcache_tut.cpp mode change 100644 => 100755 indra/test/lltranscode_tut.cpp mode change 100644 => 100755 indra/test/lltut.cpp mode change 100644 => 100755 indra/test/lltut.h mode change 100644 => 100755 indra/test/lluserrelations_tut.cpp mode change 100644 => 100755 indra/test/lluuidhashmap_tut.cpp mode change 100644 => 100755 indra/test/llxorcipher_tut.cpp mode change 100644 => 100755 indra/test/manageapr.h mode change 100644 => 100755 indra/test/message_tut.cpp mode change 100644 => 100755 indra/test/mock_http_client.cpp mode change 100644 => 100755 indra/test/mock_http_client.h mode change 100644 => 100755 indra/test/namedtempfile.h mode change 100644 => 100755 indra/test/prim_linkability_tut.cpp mode change 100644 => 100755 indra/test/test.cpp mode change 100644 => 100755 indra/test/test.h mode change 100644 => 100755 indra/test/test_llmanifest.py (limited to 'indra/test') diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/indra/test/blowfish.1.bin b/indra/test/blowfish.1.bin old mode 100644 new mode 100755 diff --git a/indra/test/blowfish.2.bin b/indra/test/blowfish.2.bin old mode 100644 new mode 100755 diff --git a/indra/test/blowfish.digits.txt b/indra/test/blowfish.digits.txt old mode 100644 new mode 100755 diff --git a/indra/test/catch_and_store_what_in.h b/indra/test/catch_and_store_what_in.h old mode 100644 new mode 100755 diff --git a/indra/test/debug.h b/indra/test/debug.h old mode 100644 new mode 100755 diff --git a/indra/test/io.cpp b/indra/test/io.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llassetuploadqueue_tut.cpp b/indra/test/llassetuploadqueue_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lldoubledispatch_tut.cpp b/indra/test/lldoubledispatch_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llevents_tut.cpp b/indra/test/llevents_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llhttpdate_tut.cpp b/indra/test/llhttpdate_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llhttpnode_tut.cpp b/indra/test/llhttpnode_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llmessagetemplateparser_tut.cpp b/indra/test/llmessagetemplateparser_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llpipeutil.cpp b/indra/test/llpipeutil.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llpipeutil.h b/indra/test/llpipeutil.h old mode 100644 new mode 100755 diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llscriptresource_tut.cpp b/indra/test/llscriptresource_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llsdmessagereader_tut.cpp b/indra/test/llsdmessagereader_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llsdtraits.h b/indra/test/llsdtraits.h old mode 100644 new mode 100755 diff --git a/indra/test/llsdutil_tut.cpp b/indra/test/llsdutil_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llservicebuilder_tut.cpp b/indra/test/llservicebuilder_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lltimestampcache_tut.cpp b/indra/test/lltimestampcache_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lltranscode_tut.cpp b/indra/test/lltranscode_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lltut.h b/indra/test/lltut.h old mode 100644 new mode 100755 diff --git a/indra/test/lluserrelations_tut.cpp b/indra/test/lluserrelations_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/lluuidhashmap_tut.cpp b/indra/test/lluuidhashmap_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/llxorcipher_tut.cpp b/indra/test/llxorcipher_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/manageapr.h b/indra/test/manageapr.h old mode 100644 new mode 100755 diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/mock_http_client.cpp b/indra/test/mock_http_client.cpp old mode 100644 new mode 100755 diff --git a/indra/test/mock_http_client.h b/indra/test/mock_http_client.h old mode 100644 new mode 100755 diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h old mode 100644 new mode 100755 diff --git a/indra/test/prim_linkability_tut.cpp b/indra/test/prim_linkability_tut.cpp old mode 100644 new mode 100755 diff --git a/indra/test/test.cpp b/indra/test/test.cpp old mode 100644 new mode 100755 diff --git a/indra/test/test.h b/indra/test/test.h old mode 100644 new mode 100755 diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py old mode 100644 new mode 100755 -- cgit v1.2.3 From b7235f1a4492bf4365d241e239eb49fb3ae8bb3e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 22 Apr 2013 14:35:07 -0400 Subject: MAINT-2612: Remove no-longer-valid unused-var warning suppressions. Somehow viewer-cat acquired a lot of source lines (in several different files) of the form: (void)somevar; where ?somevar? was not declared. Apparently someone introduced an unused declaration of ?somevar?, encountered unused-variable warnings, introduced the (void) casts to suppress those warnings, then deleted the declarations -- without deleting the (void) casts. It seems worth noting that the resulting code should not have compiled successfully on any platform. --- indra/test/io.cpp | 1 - indra/test/llstreamtools_tut.cpp | 7 ------- indra/test/lltemplatemessagebuilder_tut.cpp | 1 - 3 files changed, 9 deletions(-) (limited to 'indra/test') diff --git a/indra/test/io.cpp b/indra/test/io.cpp index 62e516accb..47a67deed0 100644 --- a/indra/test/io.cpp +++ b/indra/test/io.cpp @@ -1141,7 +1141,6 @@ namespace tut ensure("Connected to server", connected); lldebugs << "connected" << llendl; pump_loop(mPump,0.1f); - (void)elapsed; count = mPump->runningChains(); ensure_equals("server chain onboard", count, 2); lldebugs << "** Client is connected." << llendl; diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp index a9bb15d911..354c3dfe10 100644 --- a/indra/test/llstreamtools_tut.cpp +++ b/indra/test/llstreamtools_tut.cpp @@ -389,13 +389,10 @@ namespace tut is.str(str = " First Second \t \r \n Third Fourth-ShouldThisBePartOfFourth Fifth\n"); actual_result = ""; get_word(actual_result, is); // First - (void)ret; actual_result = ""; get_word(actual_result, is); // Second - (void)ret; actual_result = ""; get_word(actual_result, is); // Third - (void)ret; // the current implementation of get_word seems inconsistent with // skip_to_next_word. skip_to_next_word treats any character other @@ -486,7 +483,6 @@ namespace tut is.str(str = "First Second \t \r\n Third Fourth-ShouldThisBePartOfFourth IsThisFifth\n"); actual_result = ""; get_line(actual_result, is); - (void)ret; expected_result = "First Second \t \r\n"; ensure_equals("get_line: 1", actual_result, expected_result); @@ -551,7 +547,6 @@ namespace tut is.str(str = "Should not skip lone \r.\r\n"); actual_result = ""; get_line(actual_result, is); - (void)ret; expected_result = "Should not skip lone \r.\r\n"; ensure_equals("get_line: carriage return skipped even though not followed by newline", actual_result, expected_result); } @@ -569,7 +564,6 @@ namespace tut is.str(str = "\n"); actual_result = ""; get_line(actual_result, is); - (void)ret; expected_result = "\n"; ensure_equals("get_line: Just newline", actual_result, expected_result); } @@ -588,7 +582,6 @@ namespace tut is.str(str = "First Line.\nSecond Line.\n"); actual_result = ""; get_line(actual_result, is, 255); - (void)ret; expected_result = "First Line.\n"; ensure_equals("get_line: Basic Operation", actual_result, expected_result); diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp index 3d3edab102..dde70f98c8 100644 --- a/indra/test/lltemplatemessagebuilder_tut.cpp +++ b/indra/test/lltemplatemessagebuilder_tut.cpp @@ -963,7 +963,6 @@ namespace tut memset(buffer, 0xcc, bufferSize); reader->getString(_PREHASH_Test1, _PREHASH_Test0, bufferSize, outBuffer); - (void)outValue2; ensure_equals("Ensure present value ", outValue, inValue); ensure_equals("Ensure unchanged buffer ", strlen(outBuffer), 0); delete reader; -- cgit v1.2.3