[llvm-commits] [zorg] r99162 - in /zorg/trunk/lnt: lnt/import/ImportData lnt/import/ImportXCBTimes lnt/import/NTEmailReport.py lnt/viewer/app.py lnt/viewer/root.ptl lnt/viewer/zview/zviewui.ptl tests/Web/WebSubmit.py
Daniel Dunbar
daniel at zuster.org
Mon Mar 22 00:18:19 PDT 2010
Author: ddunbar
Date: Mon Mar 22 02:18:19 2010
New Revision: 99162
URL: http://llvm.org/viewvc/llvm-project?rev=99162&view=rev
Log:
LNT: Update imports and drop sys.path tricks now that we are building a proper package.
Modified:
zorg/trunk/lnt/lnt/import/ImportData
zorg/trunk/lnt/lnt/import/ImportXCBTimes
zorg/trunk/lnt/lnt/import/NTEmailReport.py
zorg/trunk/lnt/lnt/viewer/app.py
zorg/trunk/lnt/lnt/viewer/root.ptl
zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl
zorg/trunk/lnt/tests/Web/WebSubmit.py
Modified: zorg/trunk/lnt/lnt/import/ImportData
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/import/ImportData?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/import/ImportData (original)
+++ zorg/trunk/lnt/lnt/import/ImportData Mon Mar 22 02:18:19 2010
@@ -10,11 +10,9 @@
import plistlib
import sys
import time
-sys.path.append(os.path.join(os.path.dirname(__file__),'../'))
-import viewer
-from viewer import Util
-from viewer import PerfDB
+from lnt import viewer
+from lnt.viewer import Util, PerfDB
import NightlytestReader
import AppleOpenSSLReader
Modified: zorg/trunk/lnt/lnt/import/ImportXCBTimes
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/import/ImportXCBTimes?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/import/ImportXCBTimes (original)
+++ zorg/trunk/lnt/lnt/import/ImportXCBTimes Mon Mar 22 02:18:19 2010
@@ -3,10 +3,9 @@
import os
import time
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__),'../'))
-import viewer
-from viewer import Util
-from viewer import PerfDB
+
+from lnt import viewer
+from lnt.viewer import Util, PerfDB
def main():
global opts
Modified: zorg/trunk/lnt/lnt/import/NTEmailReport.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/import/NTEmailReport.py?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/import/NTEmailReport.py (original)
+++ zorg/trunk/lnt/lnt/import/NTEmailReport.py Mon Mar 22 02:18:19 2010
@@ -9,12 +9,11 @@
import os
import smtplib
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__),'../'))
import StringIO
-import viewer
-from viewer import PerfDB
-from viewer.NTUtil import *
+from lnt import viewer
+from lnt.viewer import PerfDB
+from lnt.viewer.NTUtil import *
def main():
global opts
Modified: zorg/trunk/lnt/lnt/viewer/app.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/app.py?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/app.py (original)
+++ zorg/trunk/lnt/lnt/viewer/app.py Mon Mar 22 02:18:19 2010
@@ -16,11 +16,11 @@
# Optionally enable auto-restart.
if configData.get('wsgi_restart', False):
- from viewer import wsgi_restart
+ from lnt.viewer import wsgi_restart
wsgi_restart.track(configPath)
wsgi_restart.start()
- from viewer import publisher
+ from lnt.viewer import publisher
return publisher.create_publisher(configPath, configData, threaded=True)
def create_app(cfg_path=None):
Modified: zorg/trunk/lnt/lnt/viewer/root.ptl
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/root.ptl?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/root.ptl (original)
+++ zorg/trunk/lnt/lnt/viewer/root.ptl Mon Mar 22 02:18:19 2010
@@ -339,9 +339,9 @@
# internally to fix the FIXME above and keep it more readable, we
# want to serialize imports to keep SQLite happy and avoiding
# dropping submissions.
- import subprocess
- p = subprocess.Popen([os.path.join(self.config.zorgDir,
- "import/ImportData"),
+ import lnt, subprocess
+ lnt_dir = os.path.dirname(lnt.__file__)
+ p = subprocess.Popen([os.path.join(lnt_dir, "import/ImportData"),
"--commit=%s" % form['commit'],
"--email-on-import=%s" % int(self.config.ntEmailEnabled),
"--email-base-url=%s/db_%s/nightlytest/" % (self.config.zorgURL,
Modified: zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl (original)
+++ zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl Mon Mar 22 02:18:19 2010
@@ -7,8 +7,8 @@
from quixote.directory import Directory
from quixote.html import htmltext
-from viewer.PerfDB import Machine, Run, Sample, Test
-from viewer import NTUtil
+from lnt.viewer.PerfDB import Machine, Run, Sample, Test
+from lnt.viewer import NTUtil
from sqlalchemy import func
Modified: zorg/trunk/lnt/tests/Web/WebSubmit.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/Web/WebSubmit.py?rev=99162&r1=99161&r2=99162&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/Web/WebSubmit.py (original)
+++ zorg/trunk/lnt/tests/Web/WebSubmit.py Mon Mar 22 02:18:19 2010
@@ -1,5 +1,5 @@
# RUN: %src_root/lnt/import/SubmitData %base_url/submitRun \
-# RUN: ../DB/Inputs/sample-a-small.plist > %t.log
+# RUN: %S/../DB/Inputs/sample-a-small.plist > %t.log
# RUN: FileCheck %s < %t.log
# CHECK: STATUS: 0
More information about the llvm-commits
mailing list