Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
a6105fb9
Commit
a6105fb9
authored
15 years ago
by
Marcel Loose
Browse files
Options
Downloads
Patches
Plain Diff
Bug 1310: Only handle -pythonpkg option in runtest.sh when using Autotools
parent
7ec82bdd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
autoconf_share/Makefile.common
+2
-1
2 additions, 1 deletion
autoconf_share/Makefile.common
autoconf_share/runtest.sh
+3
-2
3 additions, 2 deletions
autoconf_share/runtest.sh
with
5 additions
and
3 deletions
autoconf_share/Makefile.common
+
2
−
1
View file @
a6105fb9
...
...
@@ -274,4 +274,5 @@ TESTS_ENVIRONMENT = LOFARROOT="$(LOFARROOT)" \
srcdir
=
"
$(
srcdir
)
"
\
CHECKTOOLPROGS
=
"
$(
CHECKTOOLPROGS
)
"
\
MPIBIN
=
"
$(
MPIBIN
)
"
\
AIPSPP
=
"
$(
AIPSPP
)
"
AIPSPP
=
"
$(
AIPSPP
)
"
\
GNU_AUTOTOOLS
=
"yes"
This diff is collapsed.
Click to expand it.
autoconf_share/runtest.sh
+
3
−
2
View file @
a6105fb9
...
...
@@ -167,9 +167,10 @@ else
fi
# For python files create the lofar/package directory, so the tests can
# be run as if the python files were installed.
# be run as if the python files were installed. This is only needed when
# using the GNU Autotools (note: GNU_AUTOTOOLS is set in Makefile.common).
# Note that python looks in . before PYTHONPATH.
if
[
"
$PYTHONPKG
"
!=
""
]
;
then
if
[
"
$PYTHONPKG
"
!=
""
-a
"
$GNU_AUTOTOOLS
"
!=
""
]
;
then
PYTHONDIR
=
${
1
}
_tmp_pythonpkg_dir
# will be removed automatically
mkdir
-p
$PYTHONDIR
/lofar/
$PYTHONPKG
touch
$PYTHONDIR
/lofar/__init__.py
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment