mirror of https://github.com/perkeep/perkeep.git
Some binary names changed (match directories now)
This commit is contained in:
parent
a98ce4b067
commit
787576f396
|
@ -5,7 +5,7 @@ use FindBin;
|
|||
use Getopt::Long;
|
||||
|
||||
sub usage {
|
||||
die "Usage: dev-blobserver [--wipe] <portnumber> -- [other_camlistored_opts]";
|
||||
die "Usage: dev-blobserver [--wipe] <portnumber> -- [other_blobserver_opts]";
|
||||
}
|
||||
|
||||
my $opt_wipe;
|
||||
|
@ -29,7 +29,7 @@ unless (-d $root) {
|
|||
print "Starting blobserver on http://localhost:$port/ in $root\n";
|
||||
|
||||
$ENV{CAMLI_PASSWORD} = "pass$port";
|
||||
exec("$FindBin::Bin/server/go/blobserver/camlistored",
|
||||
exec("$FindBin::Bin/server/go/blobserver/blobserver",
|
||||
"-root=$root",
|
||||
"-listen=:$port",
|
||||
@ARGV);
|
||||
|
|
|
@ -6,7 +6,7 @@ use Getopt::Long;
|
|||
use DBI;
|
||||
|
||||
sub usage {
|
||||
die "Usage: dev-indexer [--wipe] <portnumber> -- [other_camlistored_opts]";
|
||||
die "Usage: dev-indexer [--wipe] <portnumber> -- [other_blobserver_opts]";
|
||||
}
|
||||
|
||||
my $opt_wipe;
|
||||
|
@ -81,7 +81,7 @@ if ($opt_wipe) {
|
|||
print "Starting blobserver with indexer on http://localhost:$port/ in $root\n";
|
||||
|
||||
$ENV{CAMLI_PASSWORD} = "pass$port";
|
||||
exec("$FindBin::Bin/server/go/blobserver/camlistored",
|
||||
exec("$FindBin::Bin/server/go/blobserver/blobserver",
|
||||
"-root=$root", # NOTE: Root required but not used by indexer blobserver
|
||||
"-listen=:$port",
|
||||
"-devmysqlindexer",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
|
||||
export CAMLI_PASSWORD=test
|
||||
make && ./camsigd "$@"
|
||||
make && ./sigserver "$@"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/perl
|
||||
#
|
||||
# Common test library for camsigd
|
||||
# Common test library for camsigd (sigserver)
|
||||
|
||||
package CamsigdTest;
|
||||
|
||||
|
@ -11,7 +11,7 @@ use LWP::UserAgent;
|
|||
use HTTP::Request;
|
||||
use Fcntl;
|
||||
|
||||
our $BINARY = "$FindBin::Bin/../camsigd";
|
||||
our $BINARY = "$FindBin::Bin/../sigserver";
|
||||
|
||||
sub start {
|
||||
my ($port_rd, $port_wr, $exit_rd, $exit_wr);
|
||||
|
|
|
@ -290,7 +290,7 @@ sub start {
|
|||
and die "Failed to build Go blobserver.";
|
||||
|
||||
my $bindir = "$FindBin::Bin/../go/blobserver/";
|
||||
my $binary = "$bindir/camlistored";
|
||||
my $binary = "$bindir/blobserver";
|
||||
|
||||
chdir($bindir) or die "filed to chdir to $bindir: $!";
|
||||
system("make") and die "failed to run make in $bindir";
|
||||
|
|
|
@ -11,4 +11,4 @@ chmod 0700 $ROOT
|
|||
|
||||
export CAMLI_PASSWORD=`cat $HOME/.camli/camorg-blobserver.pass`
|
||||
|
||||
$Bin/../../build.pl server/go/blobserver && $Bin/../../server/go/blobserver/camlistored -root=$ROOT -listen=:3179 "$@"
|
||||
$Bin/../../build.pl server/go/blobserver && $Bin/../../server/go/blobserver/blobserver -root=$ROOT -listen=:3179 "$@"
|
||||
|
|
Loading…
Reference in New Issue