diff --git a/.gitignore b/.gitignore index 9b8baa9a2a0..52a03636b97 100644 --- a/.gitignore +++ b/.gitignore @@ -49,8 +49,8 @@ programs/data-dir programs/enu-abigen/enu-abigen programs/cleos/config.hpp programs/enu-applesedemo/enu-applesedemo -programs/eosio-launcher/config.hpp -programs/eosio-launcher/eosio-launcher +programs/enu-launcher/config.hpp +programs/enu-launcher/enu-launcher programs/keosd/keosd programs/nodeos/config.hpp programs/nodeos/nodeos diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 7022b219f9a..8bc716f974f 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory( nodeos ) add_subdirectory( cleos ) add_subdirectory( keosd ) -add_subdirectory( eosio-launcher ) +add_subdirectory( enu-launcher ) add_subdirectory( enu-applesedemo ) add_subdirectory( enu-abigen ) diff --git a/programs/enu-launcher/CMakeLists.txt b/programs/enu-launcher/CMakeLists.txt index c0c19262e09..c42756d8f13 100644 --- a/programs/enu-launcher/CMakeLists.txt +++ b/programs/enu-launcher/CMakeLists.txt @@ -1,4 +1,4 @@ -add_executable( eosio-launcher main.cpp ) +add_executable( enu-launcher main.cpp ) if( UNIX AND NOT APPLE ) set(rt_library rt ) endif() @@ -26,13 +26,13 @@ endif() configure_file(config.hpp.in config.hpp ESCAPE_QUOTES) -target_include_directories(eosio-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(enu-launcher PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(eosio-launcher +target_link_libraries(enu-launcher PRIVATE eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} ) install( TARGETS - eosio-launcher + enu-launcher RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} diff --git a/tests/p2p_tests/sync/test.sh b/tests/p2p_tests/sync/test.sh index e07198d03d8..350c595945f 100755 --- a/tests/p2p_tests/sync/test.sh +++ b/tests/p2p_tests/sync/test.sh @@ -53,7 +53,7 @@ else fi total_nodes="${total_nodes:-`echo $pnodes`}" -launcherPath="programs/eosio-launcher/eosio-launcher" +launcherPath="programs/enu-launcher/enu-launcher" clientPath="programs/cleos/cleos" rm -rf etc/eosio/node_* var/lib/* stage diff --git a/tests/testUtils.py b/tests/testUtils.py index dd918a567be..0b3aa1626ea 100755 --- a/tests/testUtils.py +++ b/tests/testUtils.py @@ -30,7 +30,7 @@ class Utils: EosServerName="nodeos" EosServerPath="programs/nodeos/"+ EosServerName - EosLauncherPath="programs/eosio-launcher/eosio-launcher" + EosLauncherPath="programs/enu-launcher/enu-launcher" MongoPath="mongo" @staticmethod diff --git a/tests/trans_sync_across_mixed_cluster_test.sh b/tests/trans_sync_across_mixed_cluster_test.sh index 1e63cfe5d39..df420b3c4ca 100755 --- a/tests/trans_sync_across_mixed_cluster_test.sh +++ b/tests/trans_sync_across_mixed_cluster_test.sh @@ -66,7 +66,7 @@ verifyErrorCode() killAll() { - programs/eosio-launcher/eosio-launcher -k 15 + programs/enu-launcher/enu-launcher -k 15 } cleanup() @@ -114,7 +114,7 @@ cleanup # stand up nodeos cluster launcherOpts="-p $pnodes -n $total_nodes -s $topo -d $delay" echo Launcher options: --nodeos \"--plugin eosio::wallet_api_plugin\" $launcherOpts -programs/eosio-launcher/eosio-launcher --nodeos "--plugin eosio::wallet_api_plugin" $launcherOpts +programs/enu-launcher/enu-launcher --nodeos "--plugin eosio::wallet_api_plugin" $launcherOpts sleep 7 startPort=8888