diff --git a/build/lib/pgBackRestBuild/Config/Data.pm b/build/lib/pgBackRestBuild/Config/Data.pm index a0e6e4955..b5a89a357 100644 --- a/build/lib/pgBackRestBuild/Config/Data.pm +++ b/build/lib/pgBackRestBuild/Config/Data.pm @@ -73,7 +73,7 @@ use pgBackRest::Common::Wait; use pgBackRest::Version; #################################################################################################################################### -# Command constants - commands that are allowed in pgBackRest +# Command constants - commands that are allowed in the exe #################################################################################################################################### use constant CFGCMD_ARCHIVE_GET => 'archive-get'; push @EXPORT, qw(CFGCMD_ARCHIVE_GET); @@ -438,8 +438,8 @@ use constant CFGDEF_DEFAULT_BUFFER_SIZE_MIN => 16384; use constant CFGDEF_DEFAULT_COMPRESS_LEVEL_MIN => 0; use constant CFGDEF_DEFAULT_COMPRESS_LEVEL_MAX => 9; -use constant CFGDEF_DEFAULT_CONFIG_PATH => '/etc/pgbackrest'; -use constant CFGDEF_DEFAULT_CONFIG => CFGDEF_DEFAULT_CONFIG_PATH . '/' . BACKREST_CONF; +use constant CFGDEF_DEFAULT_CONFIG_PATH => '/etc/' . PROJECT_EXE; +use constant CFGDEF_DEFAULT_CONFIG => CFGDEF_DEFAULT_CONFIG_PATH . '/' . PROJECT_CONF; use constant CFGDEF_DEFAULT_CONFIG_INCLUDE_PATH => CFGDEF_DEFAULT_CONFIG_PATH . '/conf.d'; use constant CFGDEF_DEFAULT_DB_TIMEOUT => 1800; @@ -1224,7 +1224,7 @@ my %hConfigDefine = { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_DEFAULT => '/tmp/' . BACKREST_EXE, + &CFGDEF_DEFAULT => '/tmp/' . PROJECT_EXE, &CFGDEF_COMMAND => { &CFGCMD_ARCHIVE_GET => {}, @@ -1247,7 +1247,7 @@ my %hConfigDefine = { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_DEFAULT => '/var/log/' . BACKREST_EXE, + &CFGDEF_DEFAULT => '/var/log/' . PROJECT_EXE, &CFGDEF_COMMAND => { &CFGCMD_ARCHIVE_GET => {}, @@ -1498,7 +1498,7 @@ my %hConfigDefine = &CFGDEF_TYPE => CFGDEF_TYPE_STRING, &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, - &CFGDEF_DEFAULT => 'pgbackrest', + &CFGDEF_DEFAULT => PROJECT_EXE, &CFGDEF_NAME_ALT => { 'backup-user' => {&CFGDEF_INDEX => 1, &CFGDEF_RESET => false}, @@ -1517,7 +1517,7 @@ my %hConfigDefine = &CFGDEF_TYPE => CFGDEF_TYPE_STRING, &CFGDEF_PREFIX => CFGDEF_PREFIX_REPO, &CFGDEF_INDEX_TOTAL => CFGDEF_INDEX_REPO, - &CFGDEF_DEFAULT => '/var/lib/' . BACKREST_EXE, + &CFGDEF_DEFAULT => '/var/lib/' . PROJECT_EXE, &CFGDEF_NAME_ALT => { 'repo-path' => {&CFGDEF_INDEX => 1, &CFGDEF_RESET => false}, @@ -1788,7 +1788,7 @@ my %hConfigDefine = { &CFGDEF_SECTION => CFGDEF_SECTION_GLOBAL, &CFGDEF_TYPE => CFGDEF_TYPE_STRING, - &CFGDEF_DEFAULT => '/var/spool/' . BACKREST_EXE, + &CFGDEF_DEFAULT => '/var/spool/' . PROJECT_EXE, &CFGDEF_COMMAND => { &CFGCMD_ARCHIVE_GET => {}, diff --git a/doc/doc.pl b/doc/doc.pl index 18f412a50..ae2a07c2a 100755 --- a/doc/doc.pl +++ b/doc/doc.pl @@ -129,7 +129,7 @@ eval # Display version and exit if requested if ($bHelp || $bVersion) { - print BACKREST_NAME . ' ' . BACKREST_VERSION . " Documentation Builder\n"; + print PROJECT_NAME . ' ' . PROJECT_VERSION . " Documentation Builder\n"; if ($bHelp) { @@ -308,7 +308,7 @@ eval $oStorageDoc->pathCreate( "${strBasePath}/output/man", {strMode => '0770', bIgnoreExists => true, bCreateParent => true}); - $oStorageDoc->put("${strBasePath}/output/man/" . lc(BACKREST_NAME) . '.1.txt', $oDocConfig->manGet($oManifest)); + $oStorageDoc->put("${strBasePath}/output/man/" . lc(PROJECT_NAME) . '.1.txt', $oDocConfig->manGet($oManifest)); } elsif ($strOutput eq 'html') { diff --git a/doc/lib/BackRestDoc/Common/DocConfig.pm b/doc/lib/BackRestDoc/Common/DocConfig.pm index 70ba72c20..73458b672 100644 --- a/doc/lib/BackRestDoc/Common/DocConfig.pm +++ b/doc/lib/BackRestDoc/Common/DocConfig.pm @@ -395,9 +395,9 @@ sub manGet # Write the header my $strManPage = "NAME\n" . - ' ' . BACKREST_NAME . ' - ' . $oManifest->variableReplace($oIndexDoc->paramGet('subtitle')) . "\n\n" . + ' ' . PROJECT_NAME . ' - ' . $oManifest->variableReplace($oIndexDoc->paramGet('subtitle')) . "\n\n" . "SYNOPSIS\n" . - ' ' . BACKREST_EXE . ' [options] [command]'; + ' ' . PROJECT_EXE . ' [options] [command]'; # Output the description (first two paragraphs of index.xml introduction) my $iParaTotal = 0; @@ -490,7 +490,7 @@ sub manGet { if ($strOption eq CFGOPT_REPO_HOST_CMD || $strOption eq CFGOPT_PG_HOST_CMD) { - $strDefault = BACKREST_EXE; + $strDefault = PROJECT_EXE; } elsif ($$hConfigDefine{$strOption}{&CFGDEF_TYPE} eq &CFGDEF_TYPE_BOOLEAN) { @@ -528,25 +528,25 @@ sub manGet "\n" . " * Create a backup of the PostgreSQL `main` cluster:\n" . "\n" . - ' $ ' . BACKREST_EXE . ' --' . CFGOPT_STANZA . "=main backup\n" . + ' $ ' . PROJECT_EXE . ' --' . CFGOPT_STANZA . "=main backup\n" . "\n" . ' The `main` cluster should be configured in `' . docConfigOptionDefault(CFGOPT_CONFIG) . "`\n" . "\n" . " * Show all available backups:\n" . "\n" . - ' $ ' . BACKREST_EXE . ' ' . CFGCMD_INFO . "\n" . + ' $ ' . PROJECT_EXE . ' ' . CFGCMD_INFO . "\n" . "\n" . " * Show all available backups for a specific cluster:\n" . "\n" . - ' $ ' . BACKREST_EXE . ' --' . CFGOPT_STANZA . '=main ' . CFGCMD_INFO . "\n" . + ' $ ' . PROJECT_EXE . ' --' . CFGOPT_STANZA . '=main ' . CFGCMD_INFO . "\n" . "\n" . " * Show backup specific options:\n" . "\n" . - ' $ ' . BACKREST_EXE . ' ' . CFGCMD_HELP . ' ' . CFGCMD_BACKUP . "\n" . + ' $ ' . PROJECT_EXE . ' ' . CFGCMD_HELP . ' ' . CFGCMD_BACKUP . "\n" . "\n" . "SEE ALSO\n" . "\n" . - ' /usr/share/doc/' . BACKREST_EXE . "-doc/html/index.html\n" . + ' /usr/share/doc/' . PROJECT_EXE . "-doc/html/index.html\n" . ' ' . $oManifest->variableReplace('{[backrest-url-base]}') . "\n"; return $strManPage; @@ -805,7 +805,7 @@ sub helpOptionGet if ($strOption eq CFGOPT_REPO_HOST_CMD || $strOption eq CFGOPT_PG_HOST_CMD) { - $strDefault = '[INSTALL-PATH]/' . BACKREST_EXE; + $strDefault = '[INSTALL-PATH]/' . PROJECT_EXE; } else { diff --git a/doc/lib/BackRestDoc/Common/DocExecute.pm b/doc/lib/BackRestDoc/Common/DocExecute.pm index 100f2a0ca..666b3a803 100644 --- a/doc/lib/BackRestDoc/Common/DocExecute.pm +++ b/doc/lib/BackRestDoc/Common/DocExecute.pm @@ -525,7 +525,7 @@ sub backrestConfig if ($self->{bExe} && $self->isRequired($oSection)) { - my ($bCacheHit, $strCacheType, $hCacheKey, $hCacheValue) = $self->cachePop('cfg-' . BACKREST_EXE, $hCacheKey); + my ($bCacheHit, $strCacheType, $hCacheKey, $hCacheValue) = $self->cachePop('cfg-' . PROJECT_EXE, $hCacheKey); if ($bCacheHit) { diff --git a/doc/manifest.xml b/doc/manifest.xml index 8a1585f94..10e586410 100644 --- a/doc/manifest.xml +++ b/doc/manifest.xml @@ -5,7 +5,7 @@ pgBackRest Reliable PostgreSQL Backup & Restore - use pgBackRest::Version; BACKREST_VERSION + use pgBackRest::Version; PROJECT_VERSION use BackRestDoc::Custom::DocCustomRelease; diff --git a/doc/release.pl b/doc/release.pl index 159b99e67..351ad668e 100755 --- a/doc/release.pl +++ b/doc/release.pl @@ -90,7 +90,7 @@ eval # Display version and exit if requested if ($bHelp || $bVersion) { - print BACKREST_NAME . ' ' . BACKREST_VERSION . " Release Manager\n"; + print PROJECT_NAME . ' ' . PROJECT_VERSION . " Release Manager\n"; if ($bHelp) { @@ -124,8 +124,8 @@ eval $strDocPath, new pgBackRest::Storage::Posix::Driver({bFileSync => false, bPathSync => false})); # Determine if this is a dev release - my $bDev = BACKREST_VERSION =~ /dev$/; - my $strVersion = $bDev ? 'dev' : BACKREST_VERSION; + my $bDev = PROJECT_VERSION =~ /dev$/; + my $strVersion = $bDev ? 'dev' : PROJECT_VERSION; if ($bBuild) { diff --git a/doc/xml/release.xml b/doc/xml/release.xml index ab7abc258..58926cad8 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -47,6 +47,10 @@

Allow I/O read interface to explicitly request blocking reads.

+ +

Rename PGBACKREST/BACKREST constants to PROJECT.

+ +

Require S3 key options except for local/remote commands.

 diff --git a/lib/pgBackRest/Archive/Base.pm b/lib/pgBackRest/Archive/Base.pm index 0fee5739e..b08335005 100644 --- a/lib/pgBackRest/Archive/Base.pm +++ b/lib/pgBackRest/Archive/Base.pm @@ -43,7 +43,7 @@ sub new logDebugParam ( __PACKAGE__ . '->new', \@_, - {name => 'strBackRestBin', default => backrestBin(), trace => true}, + {name => 'strBackRestBin', default => projectBin(), trace => true}, ); # Return from function and log return values if any diff --git a/lib/pgBackRest/Archive/Get/Async.pm b/lib/pgBackRest/Archive/Get/Async.pm index 036de01bd..42ea60cca 100644 --- a/lib/pgBackRest/Archive/Get/Async.pm +++ b/lib/pgBackRest/Archive/Get/Async.pm @@ -47,7 +47,7 @@ sub new ( __PACKAGE__ . '->new', \@_, {name => 'strSpoolPath'}, - {name => 'strBackRestBin', default => backrestBin()}, + {name => 'strBackRestBin', default => projectBin()}, {name => 'rstryWal'}, ); diff --git a/lib/pgBackRest/Archive/Push/Async.pm b/lib/pgBackRest/Archive/Push/Async.pm index 926cb170c..2a4a51c53 100644 --- a/lib/pgBackRest/Archive/Push/Async.pm +++ b/lib/pgBackRest/Archive/Push/Async.pm @@ -49,7 +49,7 @@ sub new __PACKAGE__ . '->new', \@_, {name => 'strWalPath'}, {name => 'strSpoolPath'}, - {name => 'strBackRestBin', default => backrestBin()}, + {name => 'strBackRestBin', default => projectBin()}, ); # Return from function and log return values if any diff --git a/lib/pgBackRest/Backup/Backup.pm b/lib/pgBackRest/Backup/Backup.pm index 65bc3fb44..8855f145f 100644 --- a/lib/pgBackRest/Backup/Backup.pm +++ b/lib/pgBackRest/Backup/Backup.pm @@ -654,17 +654,17 @@ sub process my $strValueAborted; # Check version - if ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_VERSION) ne BACKREST_VERSION) + if ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_VERSION) ne PROJECT_VERSION) { $strKey = INI_KEY_VERSION; - $strValueNew = BACKREST_VERSION; + $strValueNew = PROJECT_VERSION; $strValueAborted = $oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_VERSION); } # Check format - elsif ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_FORMAT) ne BACKREST_FORMAT) + elsif ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_FORMAT) ne REPOSITORY_FORMAT) { $strKey = INI_KEY_FORMAT; - $strValueNew = BACKREST_FORMAT; + $strValueNew = REPOSITORY_FORMAT; $strValueAborted = $oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_FORMAT); } # Check backup type @@ -842,7 +842,7 @@ sub process # Start the backup ($strArchiveStart, $strLsnStart, $iWalSegmentSize) = $oDbMaster->backupStart( - BACKREST_NAME . ' backup started at ' . timestampFormat(undef, $lTimestampStart), cfgOption(CFGOPT_START_FAST)); + PROJECT_NAME . ' backup started at ' . timestampFormat(undef, $lTimestampStart), cfgOption(CFGOPT_START_FAST)); # Record the archive start location $oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_ARCHIVE_START, undef, $strArchiveStart); diff --git a/lib/pgBackRest/Common/Ini.pm b/lib/pgBackRest/Common/Ini.pm index f01de0ee2..1eb9b5eb9 100644 --- a/lib/pgBackRest/Common/Ini.pm +++ b/lib/pgBackRest/Common/Ini.pm @@ -98,8 +98,8 @@ sub new {name => 'bLoad', optional => true, default => true, trace => true}, {name => 'strContent', optional => true, trace => true}, {name => 'oStorage', optional => true, default => storageLocal(), trace => true}, - {name => 'iInitFormat', optional => true, default => BACKREST_FORMAT, trace => true}, - {name => 'strInitVersion', optional => true, default => BACKREST_VERSION, trace => true}, + {name => 'iInitFormat', optional => true, default => REPOSITORY_FORMAT, trace => true}, + {name => 'strInitVersion', optional => true, default => PROJECT_VERSION, trace => true}, {name => 'bIgnoreMissing', optional => true, default => false, trace => true}, {name => 'strCipherPass', optional => true, trace => true}, {name => 'strCipherPassSub', optional => true, trace => true}, diff --git a/lib/pgBackRest/Config/Config.pm b/lib/pgBackRest/Config/Config.pm index 9c0f0ad06..fbefed04e 100644 --- a/lib/pgBackRest/Config/Config.pm +++ b/lib/pgBackRest/Config/Config.pm @@ -86,7 +86,7 @@ sub configLoad my $rstrConfigJson = shift; # Set backrest bin - backrestBinSet($strBackRestBin); + projectBinSet($strBackRestBin); # Set command $strCommand = $strCommandName; @@ -347,7 +347,7 @@ sub cfgCommandWrite my $bDisplayOnly = shift; # Set defaults - $strExeString = defined($strExeString) ? $strExeString : backrestBin(); + $strExeString = defined($strExeString) ? $strExeString : projectBin(); $bIncludeConfig = defined($bIncludeConfig) ? $bIncludeConfig : false; $bIncludeCommand = defined($bIncludeCommand) ? $bIncludeCommand : true; diff --git a/lib/pgBackRest/Db.pm b/lib/pgBackRest/Db.pm index d8b0cb9a2..c74cbac73 100644 --- a/lib/pgBackRest/Db.pm +++ b/lib/pgBackRest/Db.pm @@ -219,7 +219,7 @@ sub connect { # Set application name for monitoring and debugging $self->{hDb}->do( - "set application_name = '" . BACKREST_NAME . ' [' . + "set application_name = '" . PROJECT_NAME . ' [' . (cfgOptionValid(CFGOPT_COMMAND) ? cfgOption(CFGOPT_COMMAND) : cfgCommandName(cfgCommandGet())) . "]'") or confess &log(ERROR, $self->{hDb}->errstr, ERROR_DB_QUERY); @@ -655,8 +655,8 @@ sub backupStart # database cluster. This lock helps make the stop-auto option safe. if (!$self->executeSqlOne('select pg_try_advisory_lock(' . DB_BACKUP_ADVISORY_LOCK . ')')) { - confess &log(ERROR, 'unable to acquire ' . BACKREST_NAME . " advisory lock\n" . - 'HINT: is another ' . BACKREST_NAME . ' backup already running on this cluster?', ERROR_LOCK_ACQUIRE); + confess &log(ERROR, 'unable to acquire ' . PROJECT_NAME . " advisory lock\n" . + 'HINT: is another ' . PROJECT_NAME . ' backup already running on this cluster?', ERROR_LOCK_ACQUIRE); } # If stop-auto is enabled check for a running backup. This feature is not supported for PostgreSQL >= 9.6 since backups are @@ -669,7 +669,7 @@ sub backupStart # If a backup is currently in progress emit a warning and then stop it if ($self->executeSqlOne('select pg_is_in_backup()')) { - &log(WARN, 'the cluster is already in backup mode but no ' . BACKREST_NAME . ' backup process is running.' . + &log(WARN, 'the cluster is already in backup mode but no ' . PROJECT_NAME . ' backup process is running.' . ' pg_stop_backup() will be called so a new backup can be started.'); $self->backupStop(); } @@ -812,11 +812,11 @@ sub configValidate # Check if archive_command is set my $strArchiveCommand = $self->executeSqlOne('show archive_command'); - if (index($strArchiveCommand, BACKREST_EXE) == -1) + if (index($strArchiveCommand, PROJECT_EXE) == -1) { confess &log(ERROR, 'archive_command ' . (defined($strArchiveCommand) ? "'${strArchiveCommand}'" : '[null]') . ' must contain \'' . - BACKREST_EXE . '\'', ERROR_ARCHIVE_COMMAND_INVALID); + PROJECT_EXE . '\'', ERROR_ARCHIVE_COMMAND_INVALID); } } @@ -866,7 +866,7 @@ sub walSwitch # the user if there have been no writes since the last WAL switch. if ($self->{strDbVersion} >= PG_VERSION_91) { - $self->executeSql("select pg_create_restore_point('" . BACKREST_NAME . " Archive Check');"); + $self->executeSql("select pg_create_restore_point('" . PROJECT_NAME . " Archive Check');"); } my $strWalFileName = $self->executeSqlOne( diff --git a/lib/pgBackRest/Protocol/Base/Master.pm b/lib/pgBackRest/Protocol/Base/Master.pm index b48ebdcfe..2727f5f9a 100644 --- a/lib/pgBackRest/Protocol/Base/Master.pm +++ b/lib/pgBackRest/Protocol/Base/Master.pm @@ -111,8 +111,8 @@ sub greetingRead }; # Error if greeting parameters do not match - for my $hParam ({strName => 'name', strExpected => BACKREST_NAME}, - {strName => 'version', strExpected => BACKREST_VERSION}, + for my $hParam ({strName => 'name', strExpected => PROJECT_NAME}, + {strName => 'version', strExpected => PROJECT_VERSION}, {strName => 'service', strExpected => $self->{strName}}) { if (!defined($hGreeting->{$hParam->{strName}}) || $hGreeting->{$hParam->{strName}} ne $hParam->{strExpected}) diff --git a/lib/pgBackRest/Protocol/Base/Minion.pm b/lib/pgBackRest/Protocol/Base/Minion.pm index f9c0b634e..2ad254574 100644 --- a/lib/pgBackRest/Protocol/Base/Minion.pm +++ b/lib/pgBackRest/Protocol/Base/Minion.pm @@ -80,7 +80,7 @@ sub greetingWrite # Write the greeting $self->io()->writeLine((JSON::PP->new()->canonical()->allow_nonref())->encode( - {name => BACKREST_NAME, service => $self->{strName}, version => BACKREST_VERSION})); + {name => PROJECT_NAME, service => $self->{strName}, version => PROJECT_VERSION})); } #################################################################################################################################### diff --git a/lib/pgBackRest/Protocol/Local/Process.pm b/lib/pgBackRest/Protocol/Local/Process.pm index 8f5287b4f..532a2d921 100644 --- a/lib/pgBackRest/Protocol/Local/Process.pm +++ b/lib/pgBackRest/Protocol/Local/Process.pm @@ -41,7 +41,7 @@ sub new __PACKAGE__ . '->new', \@_, {name => 'strHostType'}, {name => 'iSelectTimeout', default => int(cfgOption(CFGOPT_PROTOCOL_TIMEOUT) / 2)}, - {name => 'strBackRestBin', default => backrestBin()}, + {name => 'strBackRestBin', default => projectBin()}, {name => 'bConfessError', default => true}, ); diff --git a/lib/pgBackRest/Storage/Helper.pm b/lib/pgBackRest/Storage/Helper.pm index bed359754..7a12d377f 100644 --- a/lib/pgBackRest/Storage/Helper.pm +++ b/lib/pgBackRest/Storage/Helper.pm @@ -39,7 +39,7 @@ use constant COMPRESS_EXT => 'gz'; #################################################################################################################################### # Temp file extension #################################################################################################################################### -use constant STORAGE_TEMP_EXT => BACKREST_EXE . '.tmp'; +use constant STORAGE_TEMP_EXT => PROJECT_EXE . '.tmp'; push @EXPORT, qw(STORAGE_TEMP_EXT); #################################################################################################################################### diff --git a/lib/pgBackRest/Version.pm b/lib/pgBackRest/Version.pm index 7401a75af..688fabcd4 100644 --- a/lib/pgBackRest/Version.pm +++ b/lib/pgBackRest/Version.pm @@ -1,7 +1,7 @@ #################################################################################################################################### # VERSION MODULE # -# Contains BackRest version and format numbers. +# Contains project version and format numbers. #################################################################################################################################### package pgBackRest::Version; @@ -16,38 +16,38 @@ use Exporter qw(import); # # Defines the official project name. #----------------------------------------------------------------------------------------------------------------------------------- -use constant BACKREST_NAME => 'pgBackRest'; - push @EXPORT, qw(BACKREST_NAME); -use constant BACKREST_EXE => lc(BACKREST_NAME); - push @EXPORT, qw(BACKREST_EXE); -use constant BACKREST_CONF => BACKREST_EXE . '.conf'; - push @EXPORT, qw(BACKREST_CONF); +use constant PROJECT_NAME => 'pgBackRest'; + push @EXPORT, qw(PROJECT_NAME); +use constant PROJECT_EXE => lc(PROJECT_NAME); + push @EXPORT, qw(PROJECT_EXE); +use constant PROJECT_CONF => PROJECT_EXE . '.conf'; + push @EXPORT, qw(PROJECT_CONF); # Binary location # # Stores the exe location. #----------------------------------------------------------------------------------------------------------------------------------- -my $strBackRestBin; +my $strProjectBin; -sub backrestBin {return $strBackRestBin}; -sub backrestBinSet {$strBackRestBin = shift} +sub projectBin {return $strProjectBin}; +sub projectBinSet {$strProjectBin = shift} -push @EXPORT, qw(backrestBin backrestBinSet); +push @EXPORT, qw(projectBin projectBinSet); -# BackRest Version Number +# Project Version Number # # Defines the current version of the BackRest executable. The version number is used to track features but does not affect what # repositories or manifests can be read - that's the job of the format number. #----------------------------------------------------------------------------------------------------------------------------------- -use constant BACKREST_VERSION => '2.08dev'; - push @EXPORT, qw(BACKREST_VERSION); +use constant PROJECT_VERSION => '2.08dev'; + push @EXPORT, qw(PROJECT_VERSION); -# Format Format Number +# Repository Format Number # # Defines format for info and manifest files as well as on-disk structure. If this number changes then the repository will be # invalid unless migration functions are written. #----------------------------------------------------------------------------------------------------------------------------------- -use constant BACKREST_FORMAT => 5; - push @EXPORT, qw(BACKREST_FORMAT); +use constant REPOSITORY_FORMAT => 5; + push @EXPORT, qw(REPOSITORY_FORMAT); 1; diff --git a/libc/Makefile.PL b/libc/Makefile.PL index f12febdff..d87f1dd68 100644 --- a/libc/Makefile.PL +++ b/libc/Makefile.PL @@ -20,7 +20,7 @@ use File::Basename qw(dirname); #################################################################################################################################### # Storage object to use for all file operations #################################################################################################################################### -use constant BACKREST_NAME => 'pgBackRest'; +use constant PROJECT_NAME => 'pgBackRest'; #################################################################################################################################### # Make sure the makefile is being created in an expected test directory. This should prevent users from building it in production. @@ -105,7 +105,7 @@ for (my $iFileIdx = 1; $iFileIdx < @stryCFile; $iFileIdx++) # Write the makefile WriteMakefile ( - NAME => BACKREST_NAME . '::LibC', + NAME => PROJECT_NAME . '::LibC', VERSION => '999', AUTHOR => 'David Steele ', diff --git a/libc/build/lib/pgBackRestLibC/Build.pm b/libc/build/lib/pgBackRestLibC/Build.pm index bc1aeab4d..689c250de 100644 --- a/libc/build/lib/pgBackRestLibC/Build.pm +++ b/libc/build/lib/pgBackRestLibC/Build.pm @@ -343,7 +343,7 @@ sub buildXsAll "1;\n"; # Save the file - my $strFile = 'lib/' . BACKREST_NAME . '/' . LIB_AUTO_NAME . '.pm'; + my $strFile = 'lib/' . PROJECT_NAME . '/' . LIB_AUTO_NAME . '.pm'; if (buildPutDiffers($oStorage, "../${strFile}", $strContent)) { @@ -401,7 +401,7 @@ sub buildXsAll "\n" . "1;\n"; - $strFile = 'lib/' . BACKREST_NAME . '/Common/ExceptionAuto.pm'; + $strFile = 'lib/' . PROJECT_NAME . '/Common/ExceptionAuto.pm'; if (buildPutDiffers($oStorage, "../${strFile}", $strContent)) { diff --git a/src/command/command.c b/src/command/command.c index ff1df4d05..e6f08c406 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -52,7 +52,7 @@ cmdBegin(bool logOption) if (logOption) { - strCatFmt(info, " %s:", PGBACKREST_VERSION); + strCatFmt(info, " %s:", PROJECT_VERSION); // Add command parameters if they exist const StringList *commandParamList = cfgCommandParam(); diff --git a/src/command/help/help.c b/src/command/help/help.c index 9a4582e10..042fe26fa 100644 --- a/src/command/help/help.c +++ b/src/command/help/help.c @@ -140,7 +140,7 @@ helpRender(void) { FUNCTION_DEBUG_VOID(logLevelDebug); - String *result = strNew(PGBACKREST_NAME " " PGBACKREST_VERSION); + String *result = strNew(PROJECT_NAME " " PROJECT_VERSION); MEM_CONTEXT_TEMP_BEGIN() { @@ -155,7 +155,7 @@ helpRender(void) " - General help\n" "\n" "Usage:\n" - " " PGBACKREST_BIN " [options] [command]\n" + " " PROJECT_BIN " [options] [command]\n" "\n" "Commands:\n"); @@ -376,7 +376,7 @@ helpRender(void) // If there is more help available output a message to let the user know if (more != NULL) - strCatFmt(result, "\nUse '" PGBACKREST_BIN " help %s' for more information.\n", strPtr(more)); + strCatFmt(result, "\nUse '" PROJECT_BIN " help %s' for more information.\n", strPtr(more)); } MEM_CONTEXT_TEMP_END(); diff --git a/src/common/lock.c b/src/common/lock.c index 52c92fbb7..8fb13d9c7 100644 --- a/src/common/lock.c +++ b/src/common/lock.c @@ -97,11 +97,11 @@ lockAcquireFile(const String *lockFile, TimeMSec lockTimeout, bool failOnNoLock) const String *errorHint = NULL; if (errNo == EWOULDBLOCK) - errorHint = STRING_CONST("\nHINT: is another " PGBACKREST_NAME " process running?"); + errorHint = STRING_CONST("\nHINT: is another " PROJECT_NAME " process running?"); else if (errNo == EACCES) { errorHint = strNewFmt( - "\nHINT: does the user running " PGBACKREST_NAME " have permissions on the '%s' file?", + "\nHINT: does the user running " PROJECT_NAME " have permissions on the '%s' file?", strPtr(lockFile)); } diff --git a/src/config/parse.c b/src/config/parse.c index e21bf5340..a86c4f804 100644 --- a/src/config/parse.c +++ b/src/config/parse.c @@ -20,7 +20,7 @@ Command and Option Parse /*********************************************************************************************************************************** Standard config file name and old default path and name ***********************************************************************************************************************************/ -#define PGBACKREST_CONFIG_FILE PGBACKREST_BIN ".conf" +#define PGBACKREST_CONFIG_FILE PROJECT_BIN ".conf" #define PGBACKREST_CONFIG_ORIG_PATH_FILE "/etc/" PGBACKREST_CONFIG_FILE STRING_STATIC(PGBACKREST_CONFIG_ORIG_PATH_FILE_STR, PGBACKREST_CONFIG_ORIG_PATH_FILE); diff --git a/src/info/info.c b/src/info/info.c index a6d835cdb..09628d279 100644 --- a/src/info/info.c +++ b/src/info/info.c @@ -147,11 +147,11 @@ infoValidInternal( } // Make sure that the format is current, otherwise error - if (varIntForce(iniGet(this->ini, INI_SECTION_BACKREST_STR, INI_KEY_FORMAT_STR)) != PGBACKREST_FORMAT) + if (varIntForce(iniGet(this->ini, INI_SECTION_BACKREST_STR, INI_KEY_FORMAT_STR)) != REPOSITORY_FORMAT) { String *fmtMsg = strNewFmt( "invalid format in '%s', expected %d but found %d", - strPtr(this->fileName), PGBACKREST_FORMAT, + strPtr(this->fileName), REPOSITORY_FORMAT, varIntForce(iniGet(this->ini, INI_SECTION_BACKREST_STR, INI_KEY_FORMAT_STR))); if (!ignoreError) diff --git a/src/main.c b/src/main.c index a976100a5..205b522b2 100644 --- a/src/main.c +++ b/src/main.c @@ -55,7 +55,7 @@ main(int argListSize, const char *argList[]) // ------------------------------------------------------------------------------------------------------------------------- else if (cfgCommand() == cfgCmdVersion) { - printf(PGBACKREST_NAME " " PGBACKREST_VERSION "\n"); + printf(PROJECT_NAME " " PROJECT_VERSION "\n"); fflush(stdout); } diff --git a/src/perl/embed.auto.c b/src/perl/embed.auto.c index ba8f087af..98de9c552 100644 --- a/src/perl/embed.auto.c +++ b/src/perl/embed.auto.c @@ -50,7 +50,7 @@ static const EmbeddedModule embeddedModule[] = "logDebugParam\n" "(\n" "__PACKAGE__ . '->new', \\@_,\n" - "{name => 'strBackRestBin', default => backrestBin(), trace => true},\n" + "{name => 'strBackRestBin', default => projectBin(), trace => true},\n" ");\n" "\n\n" "return logDebugReturn\n" @@ -517,7 +517,7 @@ static const EmbeddedModule embeddedModule[] = "(\n" "__PACKAGE__ . '->new', \\@_,\n" "{name => 'strSpoolPath'},\n" - "{name => 'strBackRestBin', default => backrestBin()},\n" + "{name => 'strBackRestBin', default => projectBin()},\n" "{name => 'rstryWal'},\n" ");\n" "\n\n" @@ -1465,7 +1465,7 @@ static const EmbeddedModule embeddedModule[] = "__PACKAGE__ . '->new', \\@_,\n" "{name => 'strWalPath'},\n" "{name => 'strSpoolPath'},\n" - "{name => 'strBackRestBin', default => backrestBin()},\n" + "{name => 'strBackRestBin', default => projectBin()},\n" ");\n" "\n\n" "return logDebugReturn\n" @@ -2550,17 +2550,17 @@ static const EmbeddedModule embeddedModule[] = "my $strValueNew;\n" "my $strValueAborted;\n" "\n\n" - "if ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_VERSION) ne BACKREST_VERSION)\n" + "if ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_VERSION) ne PROJECT_VERSION)\n" "{\n" "$strKey = INI_KEY_VERSION;\n" - "$strValueNew = BACKREST_VERSION;\n" + "$strValueNew = PROJECT_VERSION;\n" "$strValueAborted = $oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_VERSION);\n" "}\n" "\n" - "elsif ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_FORMAT) ne BACKREST_FORMAT)\n" + "elsif ($oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_FORMAT) ne REPOSITORY_FORMAT)\n" "{\n" "$strKey = INI_KEY_FORMAT;\n" - "$strValueNew = BACKREST_FORMAT;\n" + "$strValueNew = REPOSITORY_FORMAT;\n" "$strValueAborted = $oAbortedManifest->get(INI_SECTION_BACKREST, INI_KEY_FORMAT);\n" "}\n" "\n" @@ -2720,7 +2720,7 @@ static const EmbeddedModule embeddedModule[] = "\n" "($strArchiveStart, $strLsnStart, $iWalSegmentSize) =\n" "$oDbMaster->backupStart(\n" - "BACKREST_NAME . ' backup started at ' . timestampFormat(undef, $lTimestampStart), cfgOption(CFGOPT_START_FAST));\n" + "PROJECT_NAME . ' backup started at ' . timestampFormat(undef, $lTimestampStart), cfgOption(CFGOPT_START_FAST));\n" "\n\n" "$oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_ARCHIVE_START, undef, $strArchiveStart);\n" "$oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_LSN_START, undef, $strLsnStart);\n" @@ -5721,8 +5721,8 @@ static const EmbeddedModule embeddedModule[] = "{name => 'bLoad', optional => true, default => true, trace => true},\n" "{name => 'strContent', optional => true, trace => true},\n" "{name => 'oStorage', optional => true, default => storageLocal(), trace => true},\n" - "{name => 'iInitFormat', optional => true, default => BACKREST_FORMAT, trace => true},\n" - "{name => 'strInitVersion', optional => true, default => BACKREST_VERSION, trace => true},\n" + "{name => 'iInitFormat', optional => true, default => REPOSITORY_FORMAT, trace => true},\n" + "{name => 'strInitVersion', optional => true, default => PROJECT_VERSION, trace => true},\n" "{name => 'bIgnoreMissing', optional => true, default => false, trace => true},\n" "{name => 'strCipherPass', optional => true, trace => true},\n" "{name => 'strCipherPassSub', optional => true, trace => true},\n" @@ -8536,7 +8536,7 @@ static const EmbeddedModule embeddedModule[] = "my $strCommandName = shift;\n" "my $rstrConfigJson = shift;\n" "\n\n" - "backrestBinSet($strBackRestBin);\n" + "projectBinSet($strBackRestBin);\n" "\n\n" "$strCommand = $strCommandName;\n" "\n" @@ -8753,7 +8753,7 @@ static const EmbeddedModule embeddedModule[] = "my $oOptionOverride = shift;\n" "my $bDisplayOnly = shift;\n" "\n\n" - "$strExeString = defined($strExeString) ? $strExeString : backrestBin();\n" + "$strExeString = defined($strExeString) ? $strExeString : projectBin();\n" "$bIncludeConfig = defined($bIncludeConfig) ? $bIncludeConfig : false;\n" "$bIncludeCommand = defined($bIncludeCommand) ? $bIncludeCommand : true;\n" "\n\n" @@ -9038,7 +9038,7 @@ static const EmbeddedModule embeddedModule[] = "{\n" "\n" "$self->{hDb}->do(\n" - "\"set application_name = '\" . BACKREST_NAME . ' [' .\n" + "\"set application_name = '\" . PROJECT_NAME . ' [' .\n" "(cfgOptionValid(CFGOPT_COMMAND) ? cfgOption(CFGOPT_COMMAND) : cfgCommandName(cfgCommandGet())) . \"]'\")\n" "or confess &log(ERROR, $self->{hDb}->errstr, ERROR_DB_QUERY);\n" "\n\n" @@ -9399,8 +9399,8 @@ static const EmbeddedModule embeddedModule[] = "\n\n\n" "if (!$self->executeSqlOne('select pg_try_advisory_lock(' . DB_BACKUP_ADVISORY_LOCK . ')'))\n" "{\n" - "confess &log(ERROR, 'unable to acquire ' . BACKREST_NAME . \" advisory lock\\n\" .\n" - "'HINT: is another ' . BACKREST_NAME . ' backup already running on this cluster?', ERROR_LOCK_ACQUIRE);\n" + "confess &log(ERROR, 'unable to acquire ' . PROJECT_NAME . \" advisory lock\\n\" .\n" + "'HINT: is another ' . PROJECT_NAME . ' backup already running on this cluster?', ERROR_LOCK_ACQUIRE);\n" "}\n" "\n\n\n" "if (cfgOption(CFGOPT_STOP_AUTO) && $self->{strDbVersion} < PG_VERSION_96)\n" @@ -9411,7 +9411,7 @@ static const EmbeddedModule embeddedModule[] = "\n" "if ($self->executeSqlOne('select pg_is_in_backup()'))\n" "{\n" - "&log(WARN, 'the cluster is already in backup mode but no ' . BACKREST_NAME . ' backup process is running.' .\n" + "&log(WARN, 'the cluster is already in backup mode but no ' . PROJECT_NAME . ' backup process is running.' .\n" "' pg_stop_backup() will be called so a new backup can be started.');\n" "$self->backupStop();\n" "}\n" @@ -9531,11 +9531,11 @@ static const EmbeddedModule embeddedModule[] = "\n\n" "my $strArchiveCommand = $self->executeSqlOne('show archive_command');\n" "\n" - "if (index($strArchiveCommand, BACKREST_EXE) == -1)\n" + "if (index($strArchiveCommand, PROJECT_EXE) == -1)\n" "{\n" "confess &log(ERROR,\n" "'archive_command ' . (defined($strArchiveCommand) ? \"'${strArchiveCommand}'\" : '[null]') . ' must contain \\'' .\n" - "BACKREST_EXE . '\\'', ERROR_ARCHIVE_COMMAND_INVALID);\n" + "PROJECT_EXE . '\\'', ERROR_ARCHIVE_COMMAND_INVALID);\n" "}\n" "}\n" "\n" @@ -9567,7 +9567,7 @@ static const EmbeddedModule embeddedModule[] = "\n\n\n" "if ($self->{strDbVersion} >= PG_VERSION_91)\n" "{\n" - "$self->executeSql(\"select pg_create_restore_point('\" . BACKREST_NAME . \" Archive Check');\");\n" + "$self->executeSql(\"select pg_create_restore_point('\" . PROJECT_NAME . \" Archive Check');\");\n" "}\n" "\n" "my $strWalFileName = $self->executeSqlOne(\n" @@ -13099,8 +13099,8 @@ static const EmbeddedModule embeddedModule[] = "$self->io()->error(ERROR_PROTOCOL, 'invalid protocol greeting', $strGreeting);\n" "};\n" "\n\n" - "for my $hParam ({strName => 'name', strExpected => BACKREST_NAME},\n" - "{strName => 'version', strExpected => BACKREST_VERSION},\n" + "for my $hParam ({strName => 'name', strExpected => PROJECT_NAME},\n" + "{strName => 'version', strExpected => PROJECT_VERSION},\n" "{strName => 'service', strExpected => $self->{strName}})\n" "{\n" "if (!defined($hGreeting->{$hParam->{strName}}) || $hGreeting->{$hParam->{strName}} ne $hParam->{strExpected})\n" @@ -13307,7 +13307,7 @@ static const EmbeddedModule embeddedModule[] = "my $self = shift;\n" "\n\n" "$self->io()->writeLine((JSON::PP->new()->canonical()->allow_nonref())->encode(\n" - "{name => BACKREST_NAME, service => $self->{strName}, version => BACKREST_VERSION}));\n" + "{name => PROJECT_NAME, service => $self->{strName}, version => PROJECT_VERSION}));\n" "}\n" "\n\n\n\n\n\n" "sub errorWrite\n" @@ -14221,7 +14221,7 @@ static const EmbeddedModule embeddedModule[] = "__PACKAGE__ . '->new', \\@_,\n" "{name => 'strHostType'},\n" "{name => 'iSelectTimeout', default => int(cfgOption(CFGOPT_PROTOCOL_TIMEOUT) / 2)},\n" - "{name => 'strBackRestBin', default => backrestBin()},\n" + "{name => 'strBackRestBin', default => projectBin()},\n" "{name => 'bConfessError', default => true},\n" ");\n" "\n\n" @@ -18513,7 +18513,7 @@ static const EmbeddedModule embeddedModule[] = "use constant COMPRESS_EXT => 'gz';\n" "push @EXPORT, qw(COMPRESS_EXT);\n" "\n\n\n\n" - "use constant STORAGE_TEMP_EXT => BACKREST_EXE . '.tmp';\n" + "use constant STORAGE_TEMP_EXT => PROJECT_EXE . '.tmp';\n" "push @EXPORT, qw(STORAGE_TEMP_EXT);\n" "\n\n\n\n" "my $hStorage;\n" @@ -21650,25 +21650,25 @@ static const EmbeddedModule embeddedModule[] = "use Exporter qw(import);\n" "our @EXPORT = qw();\n" "\n\n\n\n\n" - "use constant BACKREST_NAME => 'pgBackRest';\n" - "push @EXPORT, qw(BACKREST_NAME);\n" - "use constant BACKREST_EXE => lc(BACKREST_NAME);\n" - "push @EXPORT, qw(BACKREST_EXE);\n" - "use constant BACKREST_CONF => BACKREST_EXE . '.conf';\n" - "push @EXPORT, qw(BACKREST_CONF);\n" + "use constant PROJECT_NAME => 'pgBackRest';\n" + "push @EXPORT, qw(PROJECT_NAME);\n" + "use constant PROJECT_EXE => lc(PROJECT_NAME);\n" + "push @EXPORT, qw(PROJECT_EXE);\n" + "use constant PROJECT_CONF => PROJECT_EXE . '.conf';\n" + "push @EXPORT, qw(PROJECT_CONF);\n" "\n\n\n\n\n" - "my $strBackRestBin;\n" + "my $strProjectBin;\n" "\n" - "sub backrestBin {return $strBackRestBin};\n" - "sub backrestBinSet {$strBackRestBin = shift}\n" + "sub projectBin {return $strProjectBin};\n" + "sub projectBinSet {$strProjectBin = shift}\n" "\n" - "push @EXPORT, qw(backrestBin backrestBinSet);\n" + "push @EXPORT, qw(projectBin projectBinSet);\n" "\n\n\n\n\n\n" - "use constant BACKREST_VERSION => '2.08dev';\n" - "push @EXPORT, qw(BACKREST_VERSION);\n" + "use constant PROJECT_VERSION => '2.08dev';\n" + "push @EXPORT, qw(PROJECT_VERSION);\n" "\n\n\n\n\n\n" - "use constant BACKREST_FORMAT => 5;\n" - "push @EXPORT, qw(BACKREST_FORMAT);\n" + "use constant REPOSITORY_FORMAT => 5;\n" + "push @EXPORT, qw(REPOSITORY_FORMAT);\n" "\n" "1;\n" }, diff --git a/src/perl/exec.c b/src/perl/exec.c index 1a4e1c9f1..b76f5a891 100644 --- a/src/perl/exec.c +++ b/src/perl/exec.c @@ -48,7 +48,7 @@ static PerlInterpreter *my_perl = NULL; /*********************************************************************************************************************************** Constants used to build perl options ***********************************************************************************************************************************/ -#define PGBACKREST_MODULE PGBACKREST_NAME "::Main" +#define PGBACKREST_MODULE PROJECT_NAME "::Main" #define PGBACKREST_MAIN PGBACKREST_MODULE "::main" /*********************************************************************************************************************************** diff --git a/src/storage/fileWrite.intern.h b/src/storage/fileWrite.intern.h index c84f306ff..8d337cc41 100644 --- a/src/storage/fileWrite.intern.h +++ b/src/storage/fileWrite.intern.h @@ -10,7 +10,7 @@ Storage File Write Internal /*********************************************************************************************************************************** Temporary file extension ***********************************************************************************************************************************/ -#define STORAGE_FILE_TEMP_EXT PGBACKREST_BIN ".tmp" +#define STORAGE_FILE_TEMP_EXT PROJECT_BIN ".tmp" /*********************************************************************************************************************************** Constructor diff --git a/src/version.h b/src/version.h index 63882d541..ae3082037 100644 --- a/src/version.h +++ b/src/version.h @@ -5,24 +5,24 @@ Version Numbers and Names #define VERSION_H /*********************************************************************************************************************************** -Official name of the software, also used for Perl package name +Official name of the project ***********************************************************************************************************************************/ -#define PGBACKREST_NAME "pgBackRest" +#define PROJECT_NAME "pgBackRest" /*********************************************************************************************************************************** Standard binary name ***********************************************************************************************************************************/ -#define PGBACKREST_BIN "pgbackrest" +#define PROJECT_BIN "pgbackrest" /*********************************************************************************************************************************** Format Number -- defines format for info and manifest files as well as on-disk structure. If this number changes then the repository will be invalid unless migration functions are written. ***********************************************************************************************************************************/ -#define PGBACKREST_FORMAT 5 +#define REPOSITORY_FORMAT 5 /*********************************************************************************************************************************** Software version. Currently this value is maintained in Version.pm and updated by test.pl. ***********************************************************************************************************************************/ -#define PGBACKREST_VERSION "2.08dev" +#define PROJECT_VERSION "2.08dev" #endif diff --git a/test/lib/pgBackRestTest/Common/CiTest.pm b/test/lib/pgBackRestTest/Common/CiTest.pm index 530345f44..212b21d58 100644 --- a/test/lib/pgBackRestTest/Common/CiTest.pm +++ b/test/lib/pgBackRestTest/Common/CiTest.pm @@ -124,11 +124,11 @@ sub process " sudo adduser --ingroup=\${USER?} --uid=5001 --disabled-password --gecos \"\" " . BACKREST_USER . "\n" . " umask 0022\n" . " cd ~ && pwd && whoami && umask && groups\n" . - " mv \${TRAVIS_BUILD_DIR?} " . BACKREST_EXE . "\n" . + " mv \${TRAVIS_BUILD_DIR?} " . PROJECT_EXE . "\n" . " rm -rf \${TRAVIS_BUILD_DIR?}\n" . "\n" . "script:\n" . - " - " . BACKREST_EXE . "/test/travis.pl \${PGB_CI?}\n"; + " - " . PROJECT_EXE . "/test/travis.pl \${PGB_CI?}\n"; buildPutDiffers($self->{oStorage}, '.travis.yml', $strConfig); diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm index 76aa024f4..20ebca278 100755 --- a/test/lib/pgBackRestTest/Common/ContainerTest.pm +++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm @@ -97,7 +97,7 @@ push @EXPORT, qw(packageDevelCover); #################################################################################################################################### sub containerRepo { - return BACKREST_EXE . qw(/) . 'test'; + return PROJECT_EXE . qw(/) . 'test'; } push @EXPORT, qw(containerRepo); diff --git a/test/lib/pgBackRestTest/Common/CoverageTest.pm b/test/lib/pgBackRestTest/Common/CoverageTest.pm index c31e06171..daba117e0 100644 --- a/test/lib/pgBackRestTest/Common/CoverageTest.pm +++ b/test/lib/pgBackRestTest/Common/CoverageTest.pm @@ -203,13 +203,13 @@ sub coverageGenerate } # Build html - my $strTitle = BACKREST_NAME . ' Coverage Report'; + my $strTitle = PROJECT_NAME . ' Coverage Report'; my $strDarkRed = '#580000'; my $strGray = '#555555'; my $strDarkGray = '#333333'; my $oHtml = new BackRestDoc::Html::DocHtmlBuilder( - BACKREST_NAME, $strTitle, + PROJECT_NAME, $strTitle, undef, undef, undef, true, true, diff --git a/test/lib/pgBackRestTest/Common/JobTest.pm b/test/lib/pgBackRestTest/Common/JobTest.pm index 43ea38d8a..df889795c 100644 --- a/test/lib/pgBackRestTest/Common/JobTest.pm +++ b/test/lib/pgBackRestTest/Common/JobTest.pm @@ -714,8 +714,8 @@ sub jobInstallC (defined($bCopyLibC) && $bCopyLibC ? "mkdir -p -m 755 ${strPerlAutoPath} && " . "cp ${strBuildLibCPath}/blib/arch/auto/pgBackRest/LibC/LibC.so ${strPerlAutoPath} && " : '') . - "cp ${strBuildBinPath}/" . BACKREST_EXE . ' /usr/bin/' . BACKREST_EXE . ' && ' . - 'chmod 755 /usr/bin/' . BACKREST_EXE . "'"); + "cp ${strBuildBinPath}/" . PROJECT_EXE . ' /usr/bin/' . PROJECT_EXE . ' && ' . + 'chmod 755 /usr/bin/' . PROJECT_EXE . "'"); } push(@EXPORT, qw(jobInstallC)); diff --git a/test/lib/pgBackRestTest/Common/LogTest.pm b/test/lib/pgBackRestTest/Common/LogTest.pm index 214fd4b93..01e5d99fe 100644 --- a/test/lib/pgBackRestTest/Common/LogTest.pm +++ b/test/lib/pgBackRestTest/Common/LogTest.pm @@ -363,10 +363,10 @@ sub regExpReplaceAll $strLine =~ s/$self->{strPgSqlBin}/[PGSQL_BIN_PATH]/g; } - $strLine = $self->regExpReplace($strLine, 'BACKREST-NAME-VERSION', '^' . BACKREST_NAME . ' ' . BACKREST_VERSION, + $strLine = $self->regExpReplace($strLine, 'BACKREST-NAME-VERSION', '^' . PROJECT_NAME . ' ' . PROJECT_VERSION, undef, false); $strLine = $self->regExpReplace( - $strLine, 'BACKREST-VERSION', ' begin ' . BACKREST_VERSION . '\:', BACKREST_VERSION, false); + $strLine, 'BACKREST-VERSION', ' begin ' . PROJECT_VERSION . '\:', PROJECT_VERSION, false); $strLine = $self->regExpReplace($strLine, undef, '^docker exec -u [a-z]* test-[0-9]+\-', 'test-[0-9]+\-', false); $strLine = $self->regExpReplace($strLine, 'CONTAINER-EXEC', '^docker exec -u [a-z]*', '^docker exec -u [a-z]*', false); @@ -414,7 +414,7 @@ sub regExpReplaceAll $strLine = $self->regExpReplace($strLine, 'TS_PATH', "PG\\_[0-9]\\.[0-9]\\_[0-9]{9}"); $strLine = $self->regExpReplace($strLine, 'VERSION', - "version[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}" . BACKREST_VERSION, BACKREST_VERSION . '$'); + "version[\"]{0,1}[ ]{0,1}[\:\=)]{1}[ ]{0,1}[\"]{0,1}" . PROJECT_VERSION, PROJECT_VERSION . '$'); $strLine = $self->regExpReplace($strLine, 'TIMESTAMP', 'timestamp"[ ]{0,1}:[ ]{0,1}[0-9]{10}','[0-9]{10}$'); diff --git a/test/lib/pgBackRestTest/Common/RunTest.pm b/test/lib/pgBackRestTest/Common/RunTest.pm index 0394fd8ec..9f8637335 100644 --- a/test/lib/pgBackRestTest/Common/RunTest.pm +++ b/test/lib/pgBackRestTest/Common/RunTest.pm @@ -162,7 +162,7 @@ sub process $self->coverage(), $self->{strBackRestExeC}, $self->{strBackRestExeHelper}, dirname($self->testPath()), $self->basePath(), $self->module(), $self->moduleTest(), true); - backrestBinSet($self->{strBackRestExe}); + projectBinSet($self->{strBackRestExe}); # Init, run, and end the test(s) $self->initModule(); diff --git a/test/lib/pgBackRestTest/Env/ConfigEnvTest.pm b/test/lib/pgBackRestTest/Env/ConfigEnvTest.pm index 164af22f0..cb8ed41b4 100644 --- a/test/lib/pgBackRestTest/Env/ConfigEnvTest.pm +++ b/test/lib/pgBackRestTest/Env/ConfigEnvTest.pm @@ -182,9 +182,9 @@ sub configTestLoad $self->configFileWrite($strConfigFile, $self->{&CONFIGENVTEST}); my @stryArg = $self->commandTestWrite(cfgCommandName($iCommandId), $strConfigFile, $self->{&CONFIGENVTEST}); - my $strConfigJson = cfgParseTest(backrestBin(), join('|', @stryArg)); + my $strConfigJson = cfgParseTest(projectBin(), join('|', @stryArg)); $self->testResult( - sub {configLoad(false, backrestBin(), cfgCommandName($iCommandId), \$strConfigJson)}, + sub {configLoad(false, projectBin(), cfgCommandName($iCommandId), \$strConfigJson)}, true, 'config load: ' . join(" ", @stryArg)); } diff --git a/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm b/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm index 077bee9b8..939fd5e7b 100644 --- a/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm +++ b/test/lib/pgBackRestTest/Env/ExpireEnvTest.pm @@ -295,13 +295,13 @@ sub backupCreate $oManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_ARCHIVE_STOP, undef, $strArchiveStop); $oManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_CHECKSUM_PAGE, undef, true); $oManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_COMPRESS, undef, true); - $oManifest->numericSet(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, BACKREST_FORMAT); + $oManifest->numericSet(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, REPOSITORY_FORMAT); $oManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_HARDLINK, undef, false); $oManifest->boolSet(MANIFEST_SECTION_BACKUP_OPTION, MANIFEST_KEY_ONLINE, undef, true); $oManifest->numericSet(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_START, undef, $lTimestamp); $oManifest->numericSet(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_STOP, undef, $lTimestamp); $oManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TYPE, undef, $strType); - $oManifest->set(INI_SECTION_BACKREST, INI_KEY_VERSION, undef, BACKREST_VERSION); + $oManifest->set(INI_SECTION_BACKREST, INI_KEY_VERSION, undef, PROJECT_VERSION); if ($strType ne CFGOPTVAL_BACKUP_TYPE_FULL) { diff --git a/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm b/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm index b03b4e6af..3c0c63b78 100644 --- a/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm +++ b/test/lib/pgBackRestTest/Env/Host/HostBackupTest.pm @@ -114,7 +114,7 @@ sub new $self->{strLockPath} = $self->testPath() . '/' . HOST_PATH_LOCK; # Set conf file - $self->{strBackRestConfig} = $self->testPath() . '/' . BACKREST_CONF; + $self->{strBackRestConfig} = $self->testPath() . '/' . PROJECT_CONF; # Set LogTest object $self->{oLogTest} = $$oParam{oLogTest}; @@ -360,17 +360,17 @@ sub backupEnd if (defined($oHostGroup->hostGet(HOST_DB_MASTER, true))) { - $self->{oLogTest}->supplementalAdd($oHostGroup->hostGet(HOST_DB_MASTER)->testPath() . '/' . BACKREST_CONF); + $self->{oLogTest}->supplementalAdd($oHostGroup->hostGet(HOST_DB_MASTER)->testPath() . '/' . PROJECT_CONF); } if (defined($oHostGroup->hostGet(HOST_DB_STANDBY, true))) { - $self->{oLogTest}->supplementalAdd($oHostGroup->hostGet(HOST_DB_STANDBY)->testPath() . '/' . BACKREST_CONF); + $self->{oLogTest}->supplementalAdd($oHostGroup->hostGet(HOST_DB_STANDBY)->testPath() . '/' . PROJECT_CONF); } if (defined($oHostGroup->hostGet(HOST_BACKUP, true))) { - $self->{oLogTest}->supplementalAdd($oHostGroup->hostGet(HOST_BACKUP)->testPath() . '/' . BACKREST_CONF); + $self->{oLogTest}->supplementalAdd($oHostGroup->hostGet(HOST_BACKUP)->testPath() . '/' . PROJECT_CONF); } if ($self->synthetic() && $bManifestCompare) @@ -466,7 +466,7 @@ sub backupCompare $oActualManifest->get(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_COPY_START); ${$oExpectedManifest}{&INI_SECTION_BACKREST}{&INI_KEY_CHECKSUM} = $oActualManifest->get(INI_SECTION_BACKREST, INI_KEY_CHECKSUM); - ${$oExpectedManifest}{&INI_SECTION_BACKREST}{&INI_KEY_FORMAT} = BACKREST_FORMAT + 0; + ${$oExpectedManifest}{&INI_SECTION_BACKREST}{&INI_KEY_FORMAT} = REPOSITORY_FORMAT + 0; if (defined($oExpectedManifest->{&INI_SECTION_CIPHER}) && defined($oExpectedManifest->{&INI_SECTION_CIPHER}{&INI_KEY_CIPHER_PASS}) && diff --git a/test/lib/pgBackRestTest/Module/Common/CommonIniPerlTest.pm b/test/lib/pgBackRestTest/Module/Common/CommonIniPerlTest.pm index b1c0f7963..b14a0f80f 100644 --- a/test/lib/pgBackRestTest/Module/Common/CommonIniPerlTest.pm +++ b/test/lib/pgBackRestTest/Module/Common/CommonIniPerlTest.pm @@ -126,7 +126,7 @@ sub run $self->testResult( sub {${storageTest()->get($strTestFile . INI_COPY_EXT)}}, - $self->iniHeader(undef, BACKREST_FORMAT, BACKREST_VERSION, $oIni->hash()), + $self->iniHeader(undef, REPOSITORY_FORMAT, PROJECT_VERSION, $oIni->hash()), 'empty with default format and version'); #--------------------------------------------------------------------------------------------------------------------------- @@ -165,15 +165,15 @@ sub run storageTest()->put($strTestFile, iniRender($hIni)); #--------------------------------------------------------------------------------------------------------------------------- - $oIni->numericSet(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, BACKREST_FORMAT - 1); + $oIni->numericSet(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, REPOSITORY_FORMAT - 1); $oIni->save(); $self->testException( sub {new pgBackRest::Common::Ini($strTestFile)}, ERROR_FILE_MISSING, "unable to open ${strTestFile} or ${strTestFile}" . INI_COPY_EXT); - # "invalid format in '${strTestFile}', expected " . BACKREST_FORMAT . ' but found ' . (BACKREST_FORMAT - 1)); + # "invalid format in '${strTestFile}', expected " . REPOSITORY_FORMAT . ' but found ' . (REPOSITORY_FORMAT - 1)); - $oIni->numericSet(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, BACKREST_FORMAT); + $oIni->numericSet(INI_SECTION_BACKREST, INI_KEY_FORMAT, undef, REPOSITORY_FORMAT); $oIni->save(); #--------------------------------------------------------------------------------------------------------------------------- @@ -187,12 +187,12 @@ sub run $oIni = new pgBackRest::Common::Ini($strTestFile); - $self->testResult(sub {$oIni->get(INI_SECTION_BACKREST, INI_KEY_VERSION)}, BACKREST_VERSION, 'version is updated on load'); + $self->testResult(sub {$oIni->get(INI_SECTION_BACKREST, INI_KEY_VERSION)}, PROJECT_VERSION, 'version is updated on load'); $oIni->save(); $self->testResult( sub {${storageTest()->get($strTestFile . INI_COPY_EXT)}}, - $self->iniHeader($oIni, undef, BACKREST_VERSION), + $self->iniHeader($oIni, undef, PROJECT_VERSION), 'verify version is updated on load'); $self->testResult(sub {$oIni->save()}, false, 'save again with no changes'); diff --git a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm index a706f52fd..fcb569fb1 100644 --- a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm @@ -95,8 +95,8 @@ sub run # Build the manifest my %oManifest; - $oManifest{&INI_SECTION_BACKREST}{&INI_KEY_VERSION} = BACKREST_VERSION; - $oManifest{&INI_SECTION_BACKREST}{&INI_KEY_FORMAT} = BACKREST_FORMAT; + $oManifest{&INI_SECTION_BACKREST}{&INI_KEY_VERSION} = PROJECT_VERSION; + $oManifest{&INI_SECTION_BACKREST}{&INI_KEY_FORMAT} = REPOSITORY_FORMAT; $oManifest{&MANIFEST_SECTION_BACKUP_OPTION}{&MANIFEST_KEY_ARCHIVE_CHECK} = JSON::PP::true; $oManifest{&MANIFEST_SECTION_BACKUP_OPTION}{&MANIFEST_KEY_ARCHIVE_COPY} = JSON::PP::true; $oManifest{&MANIFEST_SECTION_BACKUP_OPTION}{&MANIFEST_KEY_BACKUP_STANDBY} = JSON::PP::false; diff --git a/test/lib/pgBackRestTest/Module/Protocol/ProtocolCommonMinionPerlTest.pm b/test/lib/pgBackRestTest/Module/Protocol/ProtocolCommonMinionPerlTest.pm index 61f39f6c6..1620f30cf 100644 --- a/test/lib/pgBackRestTest/Module/Protocol/ProtocolCommonMinionPerlTest.pm +++ b/test/lib/pgBackRestTest/Module/Protocol/ProtocolCommonMinionPerlTest.pm @@ -116,7 +116,7 @@ sub run $self->testResult( sub {$oIoBuffered->readLine()}, - '{"name":"' . BACKREST_NAME . '","service":"test","version":"' . BACKREST_VERSION . '"}', 'read greeting'); + '{"name":"' . PROJECT_NAME . '","service":"test","version":"' . PROJECT_VERSION . '"}', 'read greeting'); #--------------------------------------------------------------------------------------------------------------------------- $self->testResult( diff --git a/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm b/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm index e811c42c5..8cd01f372 100644 --- a/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm +++ b/test/lib/pgBackRestTest/Module/Real/RealAllTest.pm @@ -634,9 +634,9 @@ sub run # Check that application name is set if ($oHostDbMaster->pgVersion() >= PG_VERSION_APPLICATION_NAME) { - my $strApplicationNameExpected = BACKREST_NAME . ' [' . cfgCommandName(CFGCMD_BACKUP) . ']'; + my $strApplicationNameExpected = PROJECT_NAME . ' [' . cfgCommandName(CFGCMD_BACKUP) . ']'; my $strApplicationName = $oHostDbMaster->sqlSelectOne( - "select application_name from pg_stat_activity where application_name like '" . BACKREST_NAME . "%'"); + "select application_name from pg_stat_activity where application_name like '" . PROJECT_NAME . "%'"); if (!defined($strApplicationName) || $strApplicationName ne $strApplicationNameExpected) { diff --git a/test/src/module/command/commandTest.c b/test/src/module/command/commandTest.c index 2d8b6fe17..a9ab998fe 100644 --- a/test/src/module/command/commandTest.c +++ b/test/src/module/command/commandTest.c @@ -33,14 +33,14 @@ testRun(void) TEST_RESULT_VOID(cmdBegin(true), "command begin with command parameter"); harnessLogResult( - "P00 INFO: archive-get command begin " PGBACKREST_VERSION ": [param1] --compress"); + "P00 INFO: archive-get command begin " PROJECT_VERSION ": [param1] --compress"); strLstAddZ(commandParamList, "param 2"); cfgCommandParamSet(commandParamList); TEST_RESULT_VOID(cmdBegin(true), "command begin with command parameters"); harnessLogResult( - "P00 INFO: archive-get command begin " PGBACKREST_VERSION ": [param1, \"param 2\"] --compress"); + "P00 INFO: archive-get command begin " PROJECT_VERSION ": [param1, \"param 2\"] --compress"); cfgInit(); cfgCommandSet(cfgCmdArchiveGet); @@ -78,7 +78,7 @@ testRun(void) TEST_RESULT_VOID(cmdBegin(true), "command begin with option logging"); harnessLogResult( - "P00 INFO: archive-get command begin " PGBACKREST_VERSION ": --no-config --db-include=db1 --db-include=db2" + "P00 INFO: archive-get command begin " PROJECT_VERSION ": --no-config --db-include=db1 --db-include=db2" " --recovery-option=standby_mode=on --recovery-option=primary_conn_info=blah --reset-repo1-host" " --repo1-path=\"/path/to the/repo\" --repo1-s3-key="); diff --git a/test/src/module/help/helpTest.c b/test/src/module/help/helpTest.c index 2cefc1a71..536cddb3a 100644 --- a/test/src/module/help/helpTest.c +++ b/test/src/module/help/helpTest.c @@ -15,7 +15,7 @@ testRun(void) FUNCTION_HARNESS_VOID(); // Program name a version are used multiple times - const char *helpVersion = PGBACKREST_NAME " " PGBACKREST_VERSION; + const char *helpVersion = PROJECT_NAME " " PROJECT_VERSION; // General help text is used in more than one test const char *generalHelp = strPtr(strNewFmt( diff --git a/test/src/module/info/infoTest.c b/test/src/module/info/infoTest.c index ef1845414..998b3136f 100644 --- a/test/src/module/info/infoTest.c +++ b/test/src/module/info/infoTest.c @@ -90,16 +90,16 @@ testRun(void) TEST_ERROR(infoNew(storageLocal(), fileName), FileMissingError, strPtr(missingInfoError)); harnessLogResult( strPtr( - strNewFmt("P00 WARN: invalid format in '%s', expected %d but found %d", strPtr(fileName), PGBACKREST_FORMAT, 4))); + strNewFmt("P00 WARN: invalid format in '%s', expected %d but found %d", strPtr(fileName), REPOSITORY_FORMAT, 4))); storageCopyNP(storageNewReadNP(storageLocal(), fileName), storageNewWriteNP(storageLocalWrite(), fileNameCopy)); TEST_ERROR( infoNew(storageLocal(), fileName), FormatError, - strPtr(strNewFmt("invalid format in '%s', expected %d but found %d", strPtr(fileName), PGBACKREST_FORMAT, 4))); + strPtr(strNewFmt("invalid format in '%s', expected %d but found %d", strPtr(fileName), REPOSITORY_FORMAT, 4))); harnessLogResult( strPtr( - strNewFmt("P00 WARN: invalid format in '%s', expected %d but found %d", strPtr(fileName), PGBACKREST_FORMAT, 4))); + strNewFmt("P00 WARN: invalid format in '%s', expected %d but found %d", strPtr(fileName), REPOSITORY_FORMAT, 4))); // Invalid checksum //-------------------------------------------------------------------------------------------------------------------------- diff --git a/test/test.pl b/test/test.pl index 77e9765e5..c47e2f30b 100755 --- a/test/test.pl +++ b/test/test.pl @@ -217,7 +217,7 @@ eval # Display version and exit if requested if ($bVersion || $bHelp) { - syswrite(*STDOUT, BACKREST_NAME . ' ' . BACKREST_VERSION . " Test Engine\n"); + syswrite(*STDOUT, PROJECT_NAME . ' ' . PROJECT_VERSION . " Test Engine\n"); if ($bHelp) { @@ -606,14 +606,14 @@ eval $bVersionDev = true; $strVersionBase = substr($strVersion, 0, length($strVersion) - 3); - if (BACKREST_VERSION !~ /dev$/ && $oRelease->nodeTest('release-core-list')) + if (PROJECT_VERSION !~ /dev$/ && $oRelease->nodeTest('release-core-list')) { confess "dev release ${strVersion} must match the program version when core changes have been made"; } } - elsif ($strVersion ne BACKREST_VERSION) + elsif ($strVersion ne PROJECT_VERSION) { - confess 'unable to find version ' . BACKREST_VERSION . " as the most recent release in ${strReleaseFile}"; + confess 'unable to find version ' . PROJECT_VERSION . " as the most recent release in ${strReleaseFile}"; } # Update version for the C code based on the current Perl version @@ -624,9 +624,9 @@ eval foreach my $strLine (split("\n", $strCVersionOld)) { - if ($strLine =~ /^#define PGBACKREST_VERSION/) + if ($strLine =~ /^#define PROJECT_VERSION/) { - $strLine = '#define PGBACKREST_VERSION' . (' ' x 42) . '"' . BACKREST_VERSION . '"'; + $strLine = '#define PROJECT_VERSION' . (' ' x 45) . '"' . PROJECT_VERSION . '"'; } $strCVersionNew .= "${strLine}\n"; @@ -1335,7 +1335,7 @@ eval } # Create code module path -- where the file is located on disk - my $strCodeModulePath = "${strBackRestBase}/lib/" . BACKREST_NAME . "/${strCodeModule}.pm"; + my $strCodeModulePath = "${strBackRestBase}/lib/" . PROJECT_NAME . "/${strCodeModule}.pm"; # Get summary results my $hCoverageResultAll = $hCoverageResult->{'summary'}{$strCodeModulePath}{total}; @@ -1382,7 +1382,7 @@ eval &log(ERROR, ('-' x 80)); executeTest( "/usr/bin/cover -report text ${strCoveragePath} --select ${strBackRestBase}/lib/" . - BACKREST_NAME . "/${strCodeModule}.pm", + PROJECT_NAME . "/${strCodeModule}.pm", {bShowOutputAsync => true}); &log(ERROR, ('-' x 80)); } @@ -1508,8 +1508,8 @@ eval $strVm, $iVmId, # Vm info $strBackRestBase, # Base backrest directory $strTestPath, # Path where the tests will run - '/usr/bin/' . BACKREST_EXE, # Path to the backrest executable - "${strBackRestBase}/bin/" . BACKREST_EXE, # Path to the backrest Perl helper + '/usr/bin/' . PROJECT_EXE, # Path to the backrest executable + "${strBackRestBase}/bin/" . PROJECT_EXE, # Path to the backrest Perl helper $strPgVersion ne 'minimal' ? $strPgSqlBin: undef, # Pg bin path $strPgVersion ne 'minimal' ? $strPgVersion: undef, # Pg version $stryModule[0], $stryModuleTest[0], \@iyModuleTestRun, # Module info