mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-09-12 05:49 am
  • Add Memory
  • Share This Entry

[dw-free] remove $LJ::HOME (use $ENV{LJHOME} only), stop 'use lib' in modules

[commit: http://hg.dwscoalition.org/dw-free/rev/164ba15fa675]

http://bugs.dwscoalition.org/show_bug.cgi?id=1760

Start moving us to use DW->home instead of environment variables or
configuration variables for locating our home directory.

Patch by [personal profile] szabgab.

Files modified:
  • cgi-bin/DW.pm
  • cgi-bin/LJ/ModuleLoader.pm
  • t/01-dw.t
  • t/console-allowopenproxy.t
  • t/console-ban.t
  • t/console-changecommunityadmin.t
  • t/console-changejournalstatus.t
  • t/console-changejournaltype.t
  • t/console-comment.t
  • t/console-community.t
  • t/console-entry.t
  • t/console-expungeuserpic.t
  • t/console-faqcat.t
  • t/console-finduser.t
  • t/console-findusercluster.t
  • t/console-friend.t
  • t/console-getrelation.t
  • t/console-infohistory.t
  • t/console-moodthemes.t
  • t/console-print.t
  • t/console-priv.t
  • t/console-reset.t
  • t/console-set.t
  • t/console-setbadpassword.t
  • t/console-suspend.t
  • t/console-syndicated.t
  • t/console-sysban.t
  • t/console-tags.t
  • t/entrycomment-create.t
  • t/esn-duplicatesubscriptions.t
  • t/esn-end2end.t
  • t/esn-findsubscription.t
  • t/esn-journalnewcomment.t
  • t/esn-journalnewentry.t
  • t/esn.t
  • t/privs.t
  • t/settings.t
  • t/usermoves.t
--------------------------------------------------------------------------------
diff -r e8d5bfb23489 -r 164ba15fa675 cgi-bin/DW.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cgi-bin/DW.pm	Sat Sep 12 05:49:21 2009 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/perl
+#
+# DW::Setting::AwesomeNewFeature
+#
+# This file is the accompanying settings package for AwesomeNewFeature. It allows users to set and
+# clear their setting choices.
+#
+# Authors:
+#      Gabor Szabo <szabgab@gmail.com>
+#
+# Copyright (c) 2009 by Dreamwidth Studios, LLC.
+#
+# This program is free software; you may redistribute it and/or modify it under
+# the same terms as Perl itself.  For a copy of the license, please reference
+# 'perldoc perlartistic' or 'perldoc perlgpl'.
+#
+
+package DW;
+
+use strict;
+use warnings;
+
+=head1 NAME
+
+DW - Dreamwidth web application
+
+=cut
+
+our $VERSION = '0.01';
+
+=head1 METHODS
+
+
+=cut
+
+# FIXME the plan is that at one point we will use File::ShareDir->dist_dir('DW')
+# or some similar way to return the home directory
+# See also http://bugs.dwscoalition.org/show_bug.cgi?id=1760
+sub home {
+    return $LJ::HOME || $ENV{LJHOME};
+}
+
+
+1;
diff -r e8d5bfb23489 -r 164ba15fa675 cgi-bin/LJ/ModuleLoader.pm
--- a/cgi-bin/LJ/ModuleLoader.pm	Sat Sep 12 05:33:57 2009 +0000
+++ b/cgi-bin/LJ/ModuleLoader.pm	Sat Sep 12 05:49:21 2009 +0000
@@ -10,12 +10,14 @@ use vars qw(@ISA @EXPORT);
 @ISA    = qw(Exporter);
 @EXPORT = qw(module_subclasses);
 
+use DW;
+
 # given a module name, looks under cgi-bin/ for its patch and, if valid,
 # returns (assumed) package names of all modules in the directory
 sub module_subclasses {
     shift if @_ > 1; # get rid of classname
     my $base_class = shift;
-    my $base_path  = "$LJ::HOME/cgi-bin/" . join("/", split("::", $base_class));
+    my $base_path  = join("/", DW->home, 'cgi-bin', split("::", $base_class));
     die "invalid base: $base_class ($base_path)" unless -d $base_path;
 
     my @dirs = $base_path;
@@ -62,7 +64,7 @@ sub require_if_exists {
 
     # allow caller to pass in "filename.pl", which will be
     # assumed in $LJHOME/cgi-bin/, otherwise a full path
-    $req_file = "$LJ::HOME/cgi-bin/$req_file"
+    $req_file = DW->home . "/cgi-bin/$req_file"
         unless $req_file =~ m!/!;
 
     # lib should return 1
diff -r e8d5bfb23489 -r 164ba15fa675 t/01-dw.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/t/01-dw.t	Sat Sep 12 05:49:21 2009 +0000
@@ -0,0 +1,15 @@
+#!/usr/bin/perl -w
+use strict;
+
+use Test::More;
+plan tests => 3;
+
+use lib "$ENV{LJHOME}/cgi-bin";
+
+use_ok('DW');
+
+my $dir = DW->home;
+
+ok($dir, 'DW->home returns something');
+ok(-d $dir, 'DW->home returns a directory');
+
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-allowopenproxy.t
--- a/t/console-allowopenproxy.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-allowopenproxy.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 9;
 use Test::More tests => 9;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-ban.t
--- a/t/console-ban.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-ban.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 12;
 use Test::More tests => 12;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-changecommunityadmin.t
--- a/t/console-changecommunityadmin.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-changecommunityadmin.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 9;
 use Test::More tests => 9;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-changejournalstatus.t
--- a/t/console-changejournalstatus.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-changejournalstatus.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 9;
 use Test::More tests => 9;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-changejournaltype.t
--- a/t/console-changejournaltype.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-changejournaltype.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-comment.t
--- a/t/console-comment.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-comment.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 14;
 use Test::More tests => 14;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-community.t
--- a/t/console-community.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-community.t	Sat Sep 12 05:49:21 2009 +0000
@@ -4,7 +4,6 @@ use lib "$ENV{LJHOME}/cgi-bin";
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
 require 'communitylib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-entry.t
--- a/t/console-entry.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-entry.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 3;
 use Test::More tests => 3;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-expungeuserpic.t
--- a/t/console-expungeuserpic.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-expungeuserpic.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 3;
 use Test::More tests => 3;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-faqcat.t
--- a/t/console-faqcat.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-faqcat.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More tests => 15;
 use Test::More tests => 15;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Lang;
 use LJ::Console;
 use LJ::Test qw (temp_user);
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-finduser.t
--- a/t/console-finduser.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-finduser.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-findusercluster.t
--- a/t/console-findusercluster.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-findusercluster.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More 'no_plan';
 use Test::More 'no_plan';
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-friend.t
--- a/t/console-friend.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-friend.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-getrelation.t
--- a/t/console-getrelation.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-getrelation.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-infohistory.t
--- a/t/console-infohistory.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-infohistory.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-moodthemes.t
--- a/t/console-moodthemes.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-moodthemes.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-print.t
--- a/t/console-print.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-print.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 local $LJ::T_NO_COMMAND_PRINT = 1;
 
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-priv.t
--- a/t/console-priv.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-priv.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-reset.t
--- a/t/console-reset.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-reset.t	Sat Sep 12 05:49:21 2009 +0000
@@ -4,7 +4,6 @@ use lib "$ENV{LJHOME}/cgi-bin";
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
 require "emailcheck.pl";
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-set.t
--- a/t/console-set.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-set.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-setbadpassword.t
--- a/t/console-setbadpassword.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-setbadpassword.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm temp_feed memcache_stress);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-suspend.t
--- a/t/console-suspend.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-suspend.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-syndicated.t
--- a/t/console-syndicated.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-syndicated.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_feed);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-sysban.t
--- a/t/console-sysban.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-sysban.t	Sat Sep 12 05:49:21 2009 +0000
@@ -4,7 +4,6 @@ use lib "$ENV{LJHOME}/cgi-bin";
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
 require 'sysban.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/console-tags.t
--- a/t/console-tags.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/console-tags.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user temp_comm);
 local $LJ::T_NO_COMMAND_PRINT = 1;
diff -r e8d5bfb23489 -r 164ba15fa675 t/entrycomment-create.t
--- a/t/entrycomment-create.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/entrycomment-create.t	Sat Sep 12 05:49:21 2009 +0000
@@ -4,7 +4,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/esn-duplicatesubscriptions.t
--- a/t/esn-duplicatesubscriptions.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/esn-duplicatesubscriptions.t	Sat Sep 12 05:49:21 2009 +0000
@@ -4,7 +4,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/esn-end2end.t
--- a/t/esn-end2end.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/esn-end2end.t	Sat Sep 12 05:49:21 2009 +0000
@@ -5,7 +5,6 @@ use lib "$ENV{LJHOME}/cgi-bin";
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
 require 'ljprotocol.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/esn-findsubscription.t
--- a/t/esn-findsubscription.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/esn-findsubscription.t	Sat Sep 12 05:49:21 2009 +0000
@@ -4,7 +4,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/esn-journalnewcomment.t
--- a/t/esn-journalnewcomment.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/esn-journalnewcomment.t	Sat Sep 12 05:49:21 2009 +0000
@@ -7,7 +7,6 @@ require 'ljprotocol.pl';
 require 'ljprotocol.pl';
 require 'talklib.pl';
 
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/esn-journalnewentry.t
--- a/t/esn-journalnewentry.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/esn-journalnewentry.t	Sat Sep 12 05:49:21 2009 +0000
@@ -6,7 +6,6 @@ require 'ljlib.pl';
 require 'ljlib.pl';
 require 'ljprotocol.pl';
 
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/esn.t
--- a/t/esn.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/esn.t	Sat Sep 12 05:49:21 2009 +0000
@@ -5,7 +5,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Event;
 use LJ::Test qw(memcache_stress temp_user);
 use FindBin qw($Bin);
diff -r e8d5bfb23489 -r 164ba15fa675 t/privs.t
--- a/t/privs.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/privs.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,7 +3,6 @@ use Test::More;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
 require 'ljlib.pl';
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 use LJ::Console;
 use LJ::Test qw (temp_user);
 
diff -r e8d5bfb23489 -r 164ba15fa675 t/settings.t
--- a/t/settings.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/settings.t	Sat Sep 12 05:49:21 2009 +0000
@@ -14,7 +14,6 @@ package main;
 package main;
 
 
-BEGIN { $LJ::HOME = $ENV{LJHOME}; }
 #use LJ::Setting::WebpageURL;
 use LJ::Setting::Gender;
 use LJ::Setting::Name;
diff -r e8d5bfb23489 -r 164ba15fa675 t/usermoves.t
--- a/t/usermoves.t	Sat Sep 12 05:33:57 2009 +0000
+++ b/t/usermoves.t	Sat Sep 12 05:49:21 2009 +0000
@@ -3,9 +3,6 @@ use strict;
 use strict;
 use Test::More;
 use lib "$ENV{LJHOME}/cgi-bin";
-BEGIN {
-    $LJ::HOME = $ENV{LJHOME}; 
-}
 require 'ljlib.pl';
 use LJ::Event;
 use FindBin qw($Bin);
--------------------------------------------------------------------------------