diff --git a/README.md b/README.md index dfc94331f..b40340831 100644 --- a/README.md +++ b/README.md @@ -69,10 +69,10 @@ In the event that the installation is a mix of Debian and from source, command line tools from `ign-tools` may not work correctly. A workaround is to define the environment variable -`IGN_CONFIG_PATH` to point to the location of the Ignition library installation, +`GZ_CONFIG_PATH` to point to the location of the Ignition library installation, where the YAML file for the package is found, such as ``` -export IGN_CONFIG_PATH=/usr/local/share/ignition +export GZ_CONFIG_PATH=/usr/local/share/ignition ``` This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issues/61). diff --git a/example/bench.cc b/example/bench.cc index 0bd3b248e..6d5f4cbab 100644 --- a/example/bench.cc +++ b/example/bench.cc @@ -365,7 +365,7 @@ class PubTester (*_stream) << "# " << std::put_time(&tm, "%FT%T%Z") << std::endl; (*_stream) << "# Ignition Transport Version " - << IGNITION_TRANSPORT_VERSION_FULL << std::endl; + << GZ_TRANSPORT_VERSION_FULL << std::endl; #ifdef __linux__ struct utsname unameData; diff --git a/log/include/gz/transport/log/Log.hh b/log/include/gz/transport/log/Log.hh index 20639024e..c999e448a 100644 --- a/log/include/gz/transport/log/Log.hh +++ b/log/include/gz/transport/log/Log.hh @@ -39,7 +39,7 @@ namespace gz inline namespace GZ_TRANSPORT_VERSION_NAMESPACE { // /// \brief Name of Environment variable containing path to schema - const std::string SchemaLocationEnvVar = "IGN_TRANSPORT_LOG_SQL_PATH"; + const std::string SchemaLocationEnvVar = "GZ_TRANSPORT_LOG_SQL_PATH"; /// \brief Interface to a log file class GZ_TRANSPORT_LOG_VISIBLE Log diff --git a/log/src/CMakeLists.txt b/log/src/CMakeLists.txt index e167185fc..14b2a1564 100644 --- a/log/src/CMakeLists.txt +++ b/log/src/CMakeLists.txt @@ -27,7 +27,7 @@ ign_build_tests( foreach(test_target ${logging_tests}) set_tests_properties(${logging_tests} PROPERTIES - ENVIRONMENT IGN_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql) + ENVIRONMENT GZ_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql) endforeach() diff --git a/log/src/Log_TEST.cc b/log/src/Log_TEST.cc index 9219e7ac5..776b7ae16 100644 --- a/log/src/Log_TEST.cc +++ b/log/src/Log_TEST.cc @@ -252,7 +252,7 @@ TEST(Log, OpenCorruptDatabase) { log::Log logFile; std::string path = - testing::portablePathUnion(IGN_TRANSPORT_LOG_TEST_PATH, "data"); + testing::portablePathUnion(GZ_TRANSPORT_LOG_TEST_PATH, "data"); path = testing::portablePathUnion(path, "state.tlog"); logFile.Open(path); EXPECT_GT(logFile.EndTime(), 0ns) << "logFile.EndTime() == " diff --git a/log/test/integration/CMakeLists.txt b/log/test/integration/CMakeLists.txt index 7732e81c6..5b813844c 100644 --- a/log/test/integration/CMakeLists.txt +++ b/log/test/integration/CMakeLists.txt @@ -23,11 +23,11 @@ endif() foreach(test_target ${logging_tests}) set_tests_properties(${test_target} PROPERTIES - ENVIRONMENT IGN_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql) + ENVIRONMENT GZ_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql) target_compile_definitions(${test_target} - PRIVATE IGN_TRANSPORT_LOG_SQL_PATH="${PROJECT_SOURCE_DIR}/log/sql") + PRIVATE GZ_TRANSPORT_LOG_SQL_PATH="${PROJECT_SOURCE_DIR}/log/sql") target_compile_definitions(${test_target} - PRIVATE IGN_TRANSPORT_LOG_BUILD_PATH="$") + PRIVATE GZ_TRANSPORT_LOG_BUILD_PATH="$") endforeach() @@ -61,12 +61,12 @@ foreach(source_file ${aux}) endif() target_compile_definitions(${BINARY_NAME} - PRIVATE IGN_TRANSPORT_LOG_BUILD_PATH="$") + PRIVATE GZ_TRANSPORT_LOG_BUILD_PATH="$") endforeach() # ign log CLI test if (IGNITION-TOOLS_BINARY_DIRS) - set(IGN_CONFIG_PATH "${CMAKE_BINARY_DIR}/log/test/lib/ruby/ignition") + set(GZ_CONFIG_PATH "${CMAKE_BINARY_DIR}/log/test/lib/ruby/ignition") add_test(ign_log_record_no_overwrite ruby ${CMAKE_CURRENT_SOURCE_DIR}/ign_log_record_no_overwrite.rb @@ -80,7 +80,7 @@ if (IGNITION-TOOLS_BINARY_DIRS) ign_log_record_force PROPERTIES ENVIRONMENT - "IGN_CONFIG_PATH=${IGN_CONFIG_PATH};IGN_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql" + "GZ_CONFIG_PATH=${GZ_CONFIG_PATH};GZ_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql" TIMEOUT 10 ) endif () diff --git a/log/test/integration/ChirpParams.hh b/log/test/integration/ChirpParams.hh index 344156a27..9bbb8a76e 100644 --- a/log/test/integration/ChirpParams.hh +++ b/log/test/integration/ChirpParams.hh @@ -68,7 +68,7 @@ namespace gz { // Set the chirping process name const std::string process = - IGN_TRANSPORT_LOG_BUILD_PATH"/INTEGRATION_topicChirp_aux"; + GZ_TRANSPORT_LOG_BUILD_PATH"/INTEGRATION_topicChirp_aux"; // Argument list: // [0]: Executable name diff --git a/log/test/integration/playback.cc b/log/test/integration/playback.cc index 3ba20ea90..f10537457 100644 --- a/log/test/integration/playback.cc +++ b/log/test/integration/playback.cc @@ -803,7 +803,7 @@ int main(int argc, char **argv) setenv("IGN_PARTITION", partition.c_str(), 1); setenv(gz::transport::log::SchemaLocationEnvVar.c_str(), - IGN_TRANSPORT_LOG_SQL_PATH, 1); + GZ_TRANSPORT_LOG_SQL_PATH, 1); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/log/test/integration/recorder.cc b/log/test/integration/recorder.cc index 3979aa1ea..41c353e8e 100644 --- a/log/test/integration/recorder.cc +++ b/log/test/integration/recorder.cc @@ -540,7 +540,7 @@ int main(int argc, char **argv) setenv("IGN_PARTITION", partition.c_str(), 1); setenv(gz::transport::log::SchemaLocationEnvVar.c_str(), - IGN_TRANSPORT_LOG_SQL_PATH, 1); + GZ_TRANSPORT_LOG_SQL_PATH, 1); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); diff --git a/log/test/test_config.h.in b/log/test/test_config.h.in index 5adfc33e8..9c354ae0b 100644 --- a/log/test/test_config.h.in +++ b/log/test/test_config.h.in @@ -19,6 +19,6 @@ #define GZ_TRANSPORT_LOG_TEST_CONFIG_HH_ -#define IGN_TRANSPORT_LOG_TEST_PATH "@CMAKE_SOURCE_DIR@/log/test" +#define GZ_TRANSPORT_LOG_TEST_PATH "@CMAKE_SOURCE_DIR@/log/test" #endif diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 81fbb7728..5d40e570a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,8 +43,8 @@ foreach(test ${test_list}) # auxiliary files from. Using a generator expression here is useful for # multi-configuration generators, like Visual Studio. target_compile_definitions(${test} PRIVATE - "DETAIL_IGN_TRANSPORT_TEST_DIR=\"$\"" - "IGN_TEST_LIBRARY_PATH=\"$\"") + "DETAIL_GZ_TRANSPORT_TEST_DIR=\"$\"" + "GZ_TEST_LIBRARY_PATH=\"$\"") endforeach() diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index e809cbc30..755d916ce 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -46,8 +46,8 @@ foreach(test ${test_list}) # auxiliary files from. Using a generator expression here is useful for # multi-configuration generators, like Visual Studio. target_compile_definitions(${test} PRIVATE - "DETAIL_IGN_TRANSPORT_TEST_DIR=\"$\"" - "IGN_TEST_LIBRARY_PATH=\"$\"") + "DETAIL_GZ_TRANSPORT_TEST_DIR=\"$\"" + "GZ_TEST_LIBRARY_PATH=\"$\"") endforeach() @@ -56,7 +56,7 @@ if (TARGET UNIT_ign_TEST) UNIT_ign_TEST PROPERTIES ENVIRONMENT - "IGN_CONFIG_PATH=${CMAKE_BINARY_DIR}/test/conf/$" + "GZ_CONFIG_PATH=${CMAKE_BINARY_DIR}/test/conf/$" ) endif() diff --git a/src/cmd/ign.cc b/src/cmd/ign.cc index ee8e5397e..575a41dbc 100644 --- a/src/cmd/ign.cc +++ b/src/cmd/ign.cc @@ -318,5 +318,5 @@ extern "C" void cmdTopicEcho(const char *_topic, ////////////////////////////////////////////////// extern "C" const char *ignitionVersion() { - return IGNITION_TRANSPORT_VERSION_FULL; + return GZ_TRANSPORT_VERSION_FULL; } diff --git a/src/cmd/ign_TEST.cc b/src/cmd/ign_TEST.cc index b06e97109..5c9b7877e 100644 --- a/src/cmd/ign_TEST.cc +++ b/src/cmd/ign_TEST.cc @@ -34,7 +34,7 @@ using namespace gz; static std::string g_partition; // NOLINT(*) static std::string g_topicCBStr; // NOLINT(*) static const std::string g_ignVersion("--force-version " + // NOLINT(*) - std::string(IGN_VERSION_FULL)); + std::string(GZ_VERSION_FULL)); ///////////////////////////////////////////////// std::string custom_exec_str(std::string _cmd) @@ -79,14 +79,14 @@ TEST(ignTest, IGN_UTILS_TEST_DISABLED_ON_MAC(TopicList)) { // Launch a new publisher process that advertises a topic. std::string publisher_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisher_path.c_str(), g_partition.c_str()); // Check the 'ign topic -l' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool topicFound = false; @@ -110,14 +110,14 @@ TEST(ignTest, TopicInfo) { // Launch a new publisher process that advertises a topic. std::string publisher_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisher_path.c_str(), g_partition.c_str()); // Check the 'ign topic -i' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool infoFound = false; @@ -146,14 +146,14 @@ TEST(ignTest, ServiceList) { // Launch a new responser process that advertises a service. std::string replier_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(replier_path.c_str(), g_partition.c_str()); // Check the 'ign service -l' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool serviceFound = false; @@ -177,14 +177,14 @@ TEST(ignTest, ServiceInfo) { // Launch a new publisher process that advertises a topic. std::string replier_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(replier_path.c_str(), g_partition.c_str()); // Check the 'ign service -i' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool infoFound = false; @@ -220,7 +220,7 @@ TEST(ignTest, TopicListSameProc) EXPECT_TRUE(pub.Publish(msg)); // Check the 'ign topic -l' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool topicFound = false; @@ -251,7 +251,7 @@ TEST(ignTest, TopicInfoSameProc) EXPECT_TRUE(pub.Publish(msg)); // Check the 'ign topic -i' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool infoFound = false; @@ -276,7 +276,7 @@ TEST(ignTest, ServiceListSameProc) EXPECT_TRUE(node.Advertise("/foo", srvEcho)); // Check the 'ign service -l' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool serviceFound = false; @@ -299,7 +299,7 @@ TEST(ignTest, ServiceInfoSameProc) EXPECT_TRUE(node.Advertise("/foo", srvEcho)); // Check the 'ign service -i' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; unsigned int retries = 0u; bool infoFound = false; @@ -326,7 +326,7 @@ TEST(ignTest, TopicPublish) EXPECT_TRUE(node.Subscribe("/bar", topicCB)); // Check the 'ign topic -p' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; std::string output; unsigned int retries = 0; @@ -336,7 +336,7 @@ TEST(ignTest, TopicPublish) if (retries % 2) { output = custom_exec_str(ign + - " topic -t /bar -m ign_msgs.StringMsg -p 'data:\"good_value\"' " + + " topic -t /bar -m gz_msgs.StringMsg -p 'data:\"good_value\"' " + g_ignVersion); EXPECT_TRUE(output.empty()) << output; } @@ -347,21 +347,21 @@ TEST(ignTest, TopicPublish) // Try to publish a message not included in Ignition Messages. std::string error = "Unable to create message of type"; output = custom_exec_str(ign + - " topic -t /bar -m ign_msgs.__bad_msg_type -p 'data:\"good_value\"' " + + " topic -t /bar -m gz_msgs.__bad_msg_type -p 'data:\"good_value\"' " + g_ignVersion); EXPECT_EQ(output.compare(0, error.size(), error), 0); // Try to publish using an incorrect topic name. error = "Topic [/] is not valid"; output = custom_exec_str(ign + - " topic -t / -m ign_msgs.StringMsg -p 'data:\"good_value\"' "+ + " topic -t / -m gz_msgs.StringMsg -p 'data:\"good_value\"' "+ g_ignVersion); EXPECT_EQ(output.compare(0, error.size(), error), 0) << output; // Try to publish using an incorrect number of arguments. error = "The following argument was not expected: wrong_topic"; output = custom_exec_str(ign + - " topic -t / wrong_topic -m ign_msgs.StringMsg -p 'data:\"good_value\"' "+ + " topic -t / wrong_topic -m gz_msgs.StringMsg -p 'data:\"good_value\"' "+ g_ignVersion); EXPECT_EQ(output.compare(0, error.size(), error), 0) << output; } @@ -381,10 +381,10 @@ TEST(ignTest, ServiceRequest) msg.set_data(10); // Check the 'ign service -r' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; std::string output = custom_exec_str(ign + - " service -s " + service + " --reqtype ign_msgs.Int32 " + - "--reptype ign_msgs.Int32 --timeout 1000 " + + " service -s " + service + " --reqtype gz_msgs.Int32 " + + "--reptype gz_msgs.Int32 --timeout 1000 " + "--req 'data: " + value + "' " + g_ignVersion); ASSERT_EQ(output, "data: " + value + "\n\n"); @@ -396,14 +396,14 @@ TEST(ignTest, TopicEcho) { // Launch a new publisher process that advertises a topic. std::string publisher_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisher_path.c_str(), g_partition.c_str()); // Check the 'ign topic -e' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; std::string output = custom_exec_str( ign + " topic -e -t /foo -d 1.5 " + g_ignVersion); @@ -422,14 +422,14 @@ TEST(ignTest, TopicEchoNum) { // Launch a new publisher process that advertises a topic. std::string publisher_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisher_path.c_str(), g_partition.c_str()); // Check the 'ign topic -e -n' command. - std::string ign = std::string(IGN_PATH) + "/ign"; + std::string ign = std::string(GZ_PATH) + "/ign"; std::string output = custom_exec_str( ign + " topic -e -t /foo -n 2 " + g_ignVersion); @@ -474,7 +474,7 @@ int main(int argc, char **argv) std::string value = ""; gz::transport::env("LD_LIBRARY_PATH", value); // Add the directory where ignition transport has been built. - value = std::string(IGN_TEST_LIBRARY_PATH) + ":" + value; + value = std::string(GZ_TEST_LIBRARY_PATH) + ":" + value; setenv("LD_LIBRARY_PATH", value.c_str(), 1); ::testing::InitGoogleTest(&argc, argv); diff --git a/src/cmd/ign_src_TEST.cc b/src/cmd/ign_src_TEST.cc index 95da2ccf6..96389c1dd 100644 --- a/src/cmd/ign_src_TEST.cc +++ b/src/cmd/ign_src_TEST.cc @@ -31,7 +31,7 @@ using namespace gz; // Global constants. static const std::string g_topic = "/topic"; // NOLINT(*) static const std::string g_service = "/echo"; // NOLINT(*) -static const std::string g_intType = "ign_msgs.Int32"; // NOLINT(*) +static const std::string g_intType = "gz_msgs.Int32"; // NOLINT(*) static const std::string g_reqData = "data: 10"; // NOLINT(*) // Global variables. diff --git a/src/cmd/service_main.cc b/src/cmd/service_main.cc index 8a80fea32..4f92bdd33 100644 --- a/src/cmd/service_main.cc +++ b/src/cmd/service_main.cc @@ -126,7 +126,7 @@ int main(int argc, char** argv) app.set_help_all_flag("--help-all", "Show all help"); app.add_flag_callback("-v,--version", [](){ - std::cout << IGNITION_TRANSPORT_VERSION_FULL << std::endl; + std::cout << GZ_TRANSPORT_VERSION_FULL << std::endl; throw CLI::Success(); }); diff --git a/src/cmd/topic_main.cc b/src/cmd/topic_main.cc index 28d36adb0..e22ee872c 100644 --- a/src/cmd/topic_main.cc +++ b/src/cmd/topic_main.cc @@ -144,7 +144,7 @@ int main(int argc, char** argv) CLI::App app{"Introspect Ignition topics"}; app.add_flag_callback("-v,--version", [](){ - std::cout << IGNITION_TRANSPORT_VERSION_FULL << std::endl; + std::cout << GZ_TRANSPORT_VERSION_FULL << std::endl; throw CLI::Success(); }); diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 756ed78ae..5ef46dbfa 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -33,7 +33,7 @@ foreach(test ${test_list}) # auxiliary files from. Using a generator expression here is useful for # multi-configuration generators, like Visual Studio. target_compile_definitions(${test} PRIVATE - "DETAIL_IGN_TRANSPORT_TEST_DIR=\"$\"") + "DETAIL_GZ_TRANSPORT_TEST_DIR=\"$\"") endforeach() diff --git a/test/integration/authPubSub.cc b/test/integration/authPubSub.cc index b0401d5c4..7ea6634d0 100644 --- a/test/integration/authPubSub.cc +++ b/test/integration/authPubSub.cc @@ -44,7 +44,7 @@ TEST(authPubSub, InvalidAuth) EXPECT_FALSE(pub.HasConnections()); std::string subscriberPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_authPubSubSubscriberInvalid_aux"); // Start the subscriber in another process with incorrect credentials. diff --git a/test/integration/scopedTopic.cc b/test/integration/scopedTopic.cc index 0b6cbb5be..18b107c86 100644 --- a/test/integration/scopedTopic.cc +++ b/test/integration/scopedTopic.cc @@ -37,7 +37,7 @@ static int data = 5; TEST(ScopedTopicTest, ProcessTest) { std::string subscriber_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_scopedTopicSubscriber_aux"); testing::forkHandlerType pi = testing::forkAndRun(subscriber_path.c_str(), diff --git a/test/integration/twoProcsPubSub.cc b/test/integration/twoProcsPubSub.cc index 309148e39..5315020ee 100644 --- a/test/integration/twoProcsPubSub.cc +++ b/test/integration/twoProcsPubSub.cc @@ -109,7 +109,7 @@ TEST(twoProcPubSub, PubSubTwoProcsThreeNodes) EXPECT_FALSE(pub.HasConnections()); std::string subscriberPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPubSubSubscriber_aux"); testing::forkHandlerType pi = testing::forkAndRun(subscriberPath.c_str(), @@ -148,7 +148,7 @@ TEST(twoProcPubSub, RawPubSubTwoProcsThreeNodes) EXPECT_FALSE(pub.HasConnections()); std::string subscriberPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPubSubSubscriber_aux"); testing::forkHandlerType pi = testing::forkAndRun(subscriberPath.c_str(), @@ -183,7 +183,7 @@ TEST(twoProcPubSub, RawPubSubTwoProcsThreeNodes) TEST(twoProcPubSub, PubSubWrongTypesOnSubscription) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -210,7 +210,7 @@ TEST(twoProcPubSub, PubSubWrongTypesOnSubscription) TEST(twoProcPubSub, PubRawSubWrongTypesOnSubscription) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -242,7 +242,7 @@ TEST(twoProcPubSub, PubRawSubWrongTypesOnSubscription) TEST(twoProcPubSub, PubSubWrongTypesTwoSubscribers) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -282,7 +282,7 @@ TEST(twoProcPubSub, PubSubWrongTypesTwoSubscribers) TEST(twoProcPubSub, PubSubWrongTypesTwoRawSubscribers) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -345,7 +345,7 @@ TEST(twoProcPubSub, PubSubWrongTypesTwoRawSubscribers) TEST(twoProcPubSub, FastPublisher) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, "INTEGRATION_fastPub_aux"); + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_fastPub_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), partition.c_str()); @@ -365,7 +365,7 @@ TEST(twoProcPubSub, FastPublisher) TEST(twoProcPubSub, SubThrottled) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, "INTEGRATION_pub_aux"); + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_pub_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), partition.c_str()); @@ -396,7 +396,7 @@ TEST(twoProcPubSub, SubThrottled) TEST(twoProcPubSub, PubThrottled) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, "INTEGRATION_pub_aux_throttled"); + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_pub_aux_throttled"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), partition.c_str()); @@ -425,7 +425,7 @@ TEST(twoProcPubSub, PubThrottled) TEST(twoProcPubSub, PubSubMessageInfo) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), partition.c_str()); @@ -453,7 +453,7 @@ TEST(twoProcPubSub, PubSubMessageInfo) TEST(twoProcPubSub, TopicList) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), partition.c_str()); @@ -504,7 +504,7 @@ TEST(twoProcPubSub, TopicList) TEST(twoProcPubSub, TopicInfo) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsPublisher_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), partition.c_str()); diff --git a/test/integration/twoProcsSrvCall.cc b/test/integration/twoProcsSrvCall.cc index e2ea155e3..994307c31 100644 --- a/test/integration/twoProcsSrvCall.cc +++ b/test/integration/twoProcsSrvCall.cc @@ -67,7 +67,7 @@ void wrongResponse(const gz::msgs::Vector3d &/*_rep*/, bool /*_result*/) TEST(twoProcSrvCall, SrvTwoProcs) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -126,7 +126,7 @@ TEST(twoProcSrvCall, SrvRequestWrongReq) unsigned int timeout = 1000; std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -166,7 +166,7 @@ TEST(twoProcSrvCall, SrvRequestWrongRep) unsigned int timeout = 1000; std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); @@ -207,7 +207,7 @@ TEST(twoProcSrvCall, SrvTwoRequestsOneWrong) unsigned int timeout = 2000; std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -248,7 +248,7 @@ TEST(twoProcSrvCall, SrvTwoRequestsOneWrong) TEST(twoProcSrvCall, ServiceList) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -300,7 +300,7 @@ TEST(twoProcSrvCall, ServiceList) TEST(twoProcSrvCall, ServiceInfo) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), diff --git a/test/integration/twoProcsSrvCallStress.cc b/test/integration/twoProcsSrvCallStress.cc index 79218caf5..6348c7052 100644 --- a/test/integration/twoProcsSrvCallStress.cc +++ b/test/integration/twoProcsSrvCallStress.cc @@ -33,7 +33,7 @@ static std::string g_topic = "/foo"; // NOLINT(*) TEST(twoProcSrvCall, ThousandCalls) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplierInc_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), diff --git a/test/integration/twoProcsSrvCallSync1.cc b/test/integration/twoProcsSrvCallSync1.cc index 323bdd006..b646b36d3 100644 --- a/test/integration/twoProcsSrvCallSync1.cc +++ b/test/integration/twoProcsSrvCallSync1.cc @@ -38,7 +38,7 @@ static int data = 5; TEST(twoProcSrvCallSync1, SrvTwoProcs) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), diff --git a/test/integration/twoProcsSrvCallWithoutInput.cc b/test/integration/twoProcsSrvCallWithoutInput.cc index 4fd347d2b..ceb13586d 100644 --- a/test/integration/twoProcsSrvCallWithoutInput.cc +++ b/test/integration/twoProcsSrvCallWithoutInput.cc @@ -68,7 +68,7 @@ void wrongResponse(const gz::msgs::Vector3d &/*_rep*/, bool /*_result*/) TEST(twoProcSrvCallWithoutInput, SrvTwoProcs) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -123,7 +123,7 @@ TEST(twoProcSrvCallWithoutInput, SrvRequestWrongRep) unsigned int timeout = 1000; std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -160,7 +160,7 @@ TEST(twoProcSrvCallWithoutInput, SrvTwoRequestsOneWrong) unsigned int timeout = 2000; std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -199,7 +199,7 @@ TEST(twoProcSrvCallWithoutInput, SrvTwoRequestsOneWrong) TEST(twoProcSrvCallWithoutInput, ServiceList) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -250,7 +250,7 @@ TEST(twoProcSrvCallWithoutInput, ServiceList) TEST(twoProcSrvCallWithoutInput, ServiceInfo) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), diff --git a/test/integration/twoProcsSrvCallWithoutInputStress.cc b/test/integration/twoProcsSrvCallWithoutInputStress.cc index ca67547ef..0c7c7f1e5 100644 --- a/test/integration/twoProcsSrvCallWithoutInputStress.cc +++ b/test/integration/twoProcsSrvCallWithoutInputStress.cc @@ -33,7 +33,7 @@ static std::string g_topic = "/foo"; // NOLINT(*) TEST(twoProcSrvCallWithoutInput, ThousandCalls) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplierInc_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), diff --git a/test/integration/twoProcsSrvCallWithoutInputSync1.cc b/test/integration/twoProcsSrvCallWithoutInputSync1.cc index a3a84c5e5..b90b43e41 100644 --- a/test/integration/twoProcsSrvCallWithoutInputSync1.cc +++ b/test/integration/twoProcsSrvCallWithoutInputSync1.cc @@ -37,7 +37,7 @@ static std::string g_topic = "/foo"; // NOLINT(*) TEST(twoProcSrvCallWithoutInputSync1, SrvTwoProcs) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutInputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), diff --git a/test/integration/twoProcsSrvCallWithoutOutput.cc b/test/integration/twoProcsSrvCallWithoutOutput.cc index fbd34cf54..559a4017c 100644 --- a/test/integration/twoProcsSrvCallWithoutOutput.cc +++ b/test/integration/twoProcsSrvCallWithoutOutput.cc @@ -51,7 +51,7 @@ TEST(twoProcSrvCallWithoutOutput, SrvRequestWrongReq) gz::msgs::Vector3d wrongReq; std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutOutputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), @@ -83,7 +83,7 @@ TEST(twoProcSrvCallWithoutOutput, SrvRequestWrongReq) TEST(twoProcSrvCallWithoutOutput, ServiceList) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutOutputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), @@ -134,7 +134,7 @@ TEST(twoProcSrvCallWithoutOutput, ServiceList) TEST(twoProcSrvCallWithoutOutput, ServiceInfo) { std::string publisherPath = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutOutputReplier_aux"); testing::forkHandlerType pi = testing::forkAndRun(publisherPath.c_str(), diff --git a/test/integration/twoProcsSrvCallWithoutOutputStress.cc b/test/integration/twoProcsSrvCallWithoutOutputStress.cc index bec9cc422..cd1352a49 100644 --- a/test/integration/twoProcsSrvCallWithoutOutputStress.cc +++ b/test/integration/twoProcsSrvCallWithoutOutputStress.cc @@ -33,7 +33,7 @@ static std::string g_topic = "/foo"; // NOLINT(*) TEST(twoProcSrvCallWithoutOuput, ThousandCalls) { std::string responser_path = testing::portablePathUnion( - IGN_TRANSPORT_TEST_DIR, + GZ_TRANSPORT_TEST_DIR, "INTEGRATION_twoProcsSrvCallWithoutOutputReplierInc_aux"); testing::forkHandlerType pi = testing::forkAndRun(responser_path.c_str(), diff --git a/test/test_config.h.in b/test/test_config.h.in index ddd01ca32..143b20799 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -18,16 +18,16 @@ #ifndef GZ_TRANSPORT_TEST_CONFIG_HH_ #define GZ_TRANSPORT_TEST_CONFIG_HH_ -#define IGN_PATH "@IGNITION-TOOLS2_BINARY_DIRS@" -#define IGN_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf" -#define IGN_VERSION_FULL "@PROJECT_VERSION_FULL@" +#define GZ_PATH "@IGNITION-TOOLS2_BINARY_DIRS@" +#define GZ_CONFIG_PATH "@CMAKE_BINARY_DIR@/test/conf" +#define GZ_VERSION_FULL "@PROJECT_VERSION_FULL@" -#ifdef DETAIL_IGN_TRANSPORT_TEST_DIR -// The DETAIL_IGN_TRANSPORT_TEST_DIR macro is defined using generator +#ifdef DETAIL_GZ_TRANSPORT_TEST_DIR +// The DETAIL_GZ_TRANSPORT_TEST_DIR macro is defined using generator // expressions in CMakeLists.txt files. See test/integration/CMakeLists.txt for // an example. -#define IGN_TRANSPORT_TEST_DIR \ - DETAIL_IGN_TRANSPORT_TEST_DIR +#define GZ_TRANSPORT_TEST_DIR \ + DETAIL_GZ_TRANSPORT_TEST_DIR #endif #ifndef __APPLE__ @@ -118,11 +118,11 @@ namespace testing /// Windows (CreateProcess) and the execution of the command provided. /// \param[in] _command The full system path to the binary to run into the /// new process. - /// \param[in] _partition Name of the ignition partition (IGN_PARTITION) + /// \param[in] _partition Name of the ignition partition (GZ_PARTITION) /// \param[in] _username Username for authentication - /// (IGN_TRANSPORT_USERNAME) + /// (GZ_TRANSPORT_USERNAME) /// \param[in] _password Password for authentication - /// (IGN_TRANSPORT_PASSWORD) + /// (GZ_TRANSPORT_PASSWORD) /// \return On success, the PID of the child process is returned in the /// parent, an 0 is returned in the child. On failure, -1 is returned in the /// parent and no child process is created. diff --git a/tutorials/20_env_variables.md b/tutorials/20_env_variables.md index 6d94eb787..a36dfd1a8 100644 --- a/tutorials/20_env_variables.md +++ b/tutorials/20_env_variables.md @@ -52,7 +52,7 @@ Below are descriptions of the available environment variables: address of another node from the other network. Note that only one IP_RELAY link is needed for bidirectional communication between nodes of two different networks. -* **IGN_TRANSPORT_LOG_SQL_PATH** +* **GZ_TRANSPORT_LOG_SQL_PATH** * *Value allowed*: Any path * *Description*: Path to the SQL files used by logging. This does not normally need to be set. It is useful to developers who are testing changes