added creation and upload of test results

This commit is contained in:
Stephen Gaito 2020-06-06 10:39:36 +00:00
parent 570421d04a
commit a3b712d893
8 changed files with 51 additions and 19 deletions

View File

@ -22,16 +22,7 @@ jobs:
env: DOCKER_FROM="ubuntu:18.04"
services:
- docker
addons:
firefox: latest
script:
- ./buildScripts/travisLinuxDoItAll
#deploy:
# provider: releases
# api_key:
# secure: ALWKAkgeLSPS4ULyTtxU50ZmSICEafCirCQ1YmuVTqe9nrc8E9Jm+4QaBlab5k6v90EpzNvZBnMOiT8cT1Wp2lqJzcGdGMcG49mhRvirdYhXgWuHYnygVgkxEhgejXcQaEiaGPDV3Y1k9MuiAVr8ApjUvIMlY4Hg1y0r7/rqR2fYmen+f+6a87bp5PptwakC9bfoYb92651d0TbugFfKT6TGKlE2jGlQ6On1alzLQ2DXA8coUjwpp4NcDD8OhnYGN/VZWkqckaBrMrHwjJ5FTfy5MGBOqCLzNix8sCGLEeCKkKC8J0nniNJ7+KOu9LJ2uIezKYfaUOJV0kik7F9ErvxjbfSRieako2yaSOR8X39aicTtpbyoXPRSKDU4WYX56vt4Dx7aNrYtP5b/UwWGXZa9MK7rNGJ+hiMDO1AzuyXirzR4RaJXCyC8n5W9ahBZBHCMqd5gMg5sMGPNj3Rgt34+R+nGYssum5wvr+6IKNl57sIoZFCgqviBrw2gJOCqlgOcEk/4ZSehWnXPCk6Gzxvkqkt/dmp8pJLNyvMaWcEZ6CXNHDU8MZS7bASo8Z7eAYvmX0MMjVty8J47expVaJ8M3OFHu6lE6tU8wwfd+Igr2TlWcixqaa3hDMgS+ghwdiZbYuMdR1AyZnEqK3xwvXXPPXrqRsB9xHtczLibkjY=
# file: pdf2htmlEX-newBuildSystem-x86_64.AppImage
# skip_cleanup: true
# on:
# tags: true
# repo: stephengaito/pdf2htmlEX

View File

@ -1,5 +1,16 @@
#!/bin/bash
source ./buildScripts/reSourceVersionEnvs
echo ""
echo "-------------------------------------------------------------------"
echo "RUNNING pdf2htmlEX tests"
echo "-------------------------------------------------------------------"
echo ""
export TEST_RESULTS_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$BUILD_DIST-$MACHINE_ARCH-testResults.zip"
echo "export TEST_RESULTS_NAME=\"$TEST_RESULTS_NAME\"" >> buildScripts/reSourceVersionEnvs
set -ev
# This bash script runs the pdf2htmlEX tests
@ -8,9 +19,14 @@ cd pdf2htmlEX/test
# The following is only needed for the local browser tests
#
#./installAutomaticTestSoftware
./installAutomaticTestSoftware
./runLocalTests
#./runLocalBrowserTests
./runLocalBrowserTests
cd ../..
mkdir -p imageBuild
zip -r imageBuild/$TEST_RESULTS_NAME /tmp/pdf2htmlEX/html /tmp/pdf2htmlEX/png

View File

@ -67,9 +67,10 @@ echo "machine uploads.github.com" >> $HOME/.netrc
echo " login $GITHUB_USERNAME" >> $HOME/.netrc
echo " password $GITHUB_TOKEN" >> $HOME/.netrc
echo $APPIMAGE_NAME > appImageName.txt
echo $DOCKER_NAME > dockerImageName.txt
echo $DPKG_NAME > debianArchiveName.txt
echo $APPIMAGE_NAME > appImageName.txt
echo $DOCKER_NAME > dockerImageName.txt
echo $DPKG_NAME > debianArchiveName.txt
echo $TEST_RESULTS_NAME > testResultsName.txt
deleteReleaseByTag "$TRAVIS_REPO_SLUG" "continuous-$BUILD_DIST"
@ -77,9 +78,11 @@ createNewRelease "$TRAVIS_REPO_SLUG" "continuous-$BUILD_DIST" "Latest $BUILD_D
../buildScripts/uploadGitHubReleaseMessage
uploadAnAsset $upload_url "appImageName.txt" "text/plain"
uploadAnAsset $upload_url "testResultsName.txt" "text/plain"
uploadAnAsset $upload_url "buildInfo.sh" "text/plain"
uploadAnAsset $upload_url "dockerImageName.txt" "text/plain"
uploadAnAsset $upload_url "debianArchiveName.txt" "text/plain"
uploadAnAsset $upload_url $APPIMAGE_NAME "application/zip"
uploadAnAsset $upload_url $TEST_RESULTS_NAME "application/zip"
uploadAnAsset $upload_url $DPKG_NAME "application/x-debian-package"

View File

@ -262,6 +262,7 @@ set(PDF2HTMLEX_TMPDIR /tmp/pdf2htmlEX/tmp)
set(PDF2HTMLEX_DATDIR /tmp/pdf2htmlEX/dat)
set(PDF2HTMLEX_PNGDIR /tmp/pdf2htmlEX/png)
set(PDF2HTMLEX_OUTDIR /tmp/pdf2htmlEX/out)
set(PDF2HTMLEX_HTMDIR /tmp/pdf2htmlEX/html)
file(MAKE_DIRECTORY ${PDF2HTMLEX_TMPDIR})
file(MAKE_DIRECTORY ${PDF2HTMLEX_DATDIR})
file(MAKE_DIRECTORY ${PDF2HTMLEX_PNGDIR})

View File

@ -51,6 +51,20 @@ class BrowserTests(Common):
shutil.copytree(self.OUTDIR, ref_htmlfolder)
return
# keep a record of the HTML files (and any differences)
# for later reporting of test results
#
try:
os.makedirs(self.HTMDIR, 0o755, True)
outHtmlFile = os.path.join(self.HTMDIR, basefilename+'.out.html')
refHtmlFile = os.path.join(self.HTMDIR, basefilename+'.ref.html')
difHtmlFile = os.path.join(self.HTMDIR, basefilename+'.diff.html')
shutil.copy(out_htmlfilename, outHtmlFile)
shutil.copy(ref_htmlfilename, refHtmlFile)
os.system("diff "+outHtmlFile+" "+refHtmlFile+" > "+difHtmlFile+" 2>&1")
except:
pass
pngfilename_out = os.path.join(self.PNGDIR, basefilename + '.out.png')
self.generate_image(out_htmlfilename, pngfilename_out)
out_img = Image.open(pngfilename_out).convert('RGB')

View File

@ -1,5 +1,7 @@
#!/bin/bash
set -ev
# This bash script installs all local software required to run the
# pdf2htmlEX tests
@ -8,6 +10,8 @@ export DEBIAN_FRONTEND=noninteractive
# Start by making sure all required apt packages exist
#
sudo apt -y install \
diffutils \
zip \
python3 \
python3-pip \
xvfb \

View File

@ -1,7 +1,5 @@
#!/bin/bash
set -ev
# This bash script runs the local browser tests
# We start by running a virtual frame buffer as display 99.0
@ -50,4 +48,8 @@ ps -ef | grep -v grep | grep Xvfb
echo "-----------------------------------------------------------"
echo ""
exit $returnCode
if [ -z "$TRAVIS_DIST"] ; then
exit $returnCode
fi
exit 0

View File

@ -28,6 +28,7 @@ class Common(object):
PNGDIR = "@PDF2HTMLEX_PNGDIR@"
DATDIR = "@PDF2HTMLEX_DATDIR@"
OUTDIR = "@PDF2HTMLEX_OUTDIR@"
HTMDIR = "@PDF2HTMLEX_HTMDIR@"
def setUp(self):
# filter manifest