|
Radostin Stoyanov |
46abdd7 |
From db79777cf017751ec54d2534966b237927f23a15 Mon Sep 17 00:00:00 2001
|
|
Radostin Stoyanov |
46abdd7 |
From: AndreyVV-100 <viazovtsev.av@phystech.edu>
|
|
Radostin Stoyanov |
46abdd7 |
Date: Fri, 23 Jul 2021 12:48:03 +0300
|
|
Radostin Stoyanov |
46abdd7 |
Subject: [PATCH 012/120] Add new files for running criu-coredump via python 2
|
|
Radostin Stoyanov |
46abdd7 |
or 3
|
|
Radostin Stoyanov |
46abdd7 |
|
|
Radostin Stoyanov |
46abdd7 |
Previous commit added support for python3 in criu-coredump. For convenience,
|
|
Radostin Stoyanov |
46abdd7 |
add two files (coredump-python2 and coredump-python3) that start
|
|
Radostin Stoyanov |
46abdd7 |
criu-coredump with respective python version. Edit env.sh accordingly.
|
|
Radostin Stoyanov |
46abdd7 |
|
|
Radostin Stoyanov |
46abdd7 |
Signed-off-by: Andrey Vyazovtsev <viazovtsev.av@phystech.edu>
|
|
Radostin Stoyanov |
46abdd7 |
---
|
|
Radostin Stoyanov |
46abdd7 |
coredump/coredump-python2 | 6 ++++++
|
|
Radostin Stoyanov |
46abdd7 |
coredump/coredump-python3 | 6 ++++++
|
|
Radostin Stoyanov |
46abdd7 |
coredump/{criu-coredump => coredump.py} | 1 -
|
|
Radostin Stoyanov |
46abdd7 |
test/others/env.sh | 2 +-
|
|
Radostin Stoyanov |
46abdd7 |
4 files changed, 13 insertions(+), 2 deletions(-)
|
|
Radostin Stoyanov |
46abdd7 |
create mode 100755 coredump/coredump-python2
|
|
Radostin Stoyanov |
46abdd7 |
create mode 100755 coredump/coredump-python3
|
|
Radostin Stoyanov |
46abdd7 |
rename coredump/{criu-coredump => coredump.py} (97%)
|
|
Radostin Stoyanov |
46abdd7 |
|
|
Radostin Stoyanov |
46abdd7 |
diff --git a/coredump/coredump-python2 b/coredump/coredump-python2
|
|
Radostin Stoyanov |
46abdd7 |
new file mode 100755
|
|
Radostin Stoyanov |
46abdd7 |
index 000000000..3a15c90a3
|
|
Radostin Stoyanov |
46abdd7 |
--- /dev/null
|
|
Radostin Stoyanov |
46abdd7 |
+++ b/coredump/coredump-python2
|
|
Radostin Stoyanov |
46abdd7 |
@@ -0,0 +1,6 @@
|
|
Radostin Stoyanov |
46abdd7 |
+#!/usr/bin/env python2
|
|
Radostin Stoyanov |
46abdd7 |
+
|
|
Radostin Stoyanov |
46abdd7 |
+import coredump
|
|
Radostin Stoyanov |
46abdd7 |
+
|
|
Radostin Stoyanov |
46abdd7 |
+if __name__ == '__main__':
|
|
Radostin Stoyanov |
46abdd7 |
+ coredump.main()
|
|
Radostin Stoyanov |
46abdd7 |
diff --git a/coredump/coredump-python3 b/coredump/coredump-python3
|
|
Radostin Stoyanov |
46abdd7 |
new file mode 100755
|
|
Radostin Stoyanov |
46abdd7 |
index 000000000..82ec6b855
|
|
Radostin Stoyanov |
46abdd7 |
--- /dev/null
|
|
Radostin Stoyanov |
46abdd7 |
+++ b/coredump/coredump-python3
|
|
Radostin Stoyanov |
46abdd7 |
@@ -0,0 +1,6 @@
|
|
Radostin Stoyanov |
46abdd7 |
+#!/usr/bin/env python3
|
|
Radostin Stoyanov |
46abdd7 |
+
|
|
Radostin Stoyanov |
46abdd7 |
+import coredump
|
|
Radostin Stoyanov |
46abdd7 |
+
|
|
Radostin Stoyanov |
46abdd7 |
+if __name__ == '__main__':
|
|
Radostin Stoyanov |
46abdd7 |
+ coredump.main()
|
|
Radostin Stoyanov |
46abdd7 |
diff --git a/coredump/criu-coredump b/coredump/coredump.py
|
|
Radostin Stoyanov |
46abdd7 |
similarity index 97%
|
|
Radostin Stoyanov |
46abdd7 |
rename from coredump/criu-coredump
|
|
Radostin Stoyanov |
46abdd7 |
rename to coredump/coredump.py
|
|
Radostin Stoyanov |
46abdd7 |
index d3113d372..56ba54083 100755
|
|
Radostin Stoyanov |
46abdd7 |
--- a/coredump/criu-coredump
|
|
Radostin Stoyanov |
46abdd7 |
+++ b/coredump/coredump.py
|
|
Radostin Stoyanov |
46abdd7 |
@@ -1,4 +1,3 @@
|
|
Radostin Stoyanov |
46abdd7 |
-#!/usr/bin/env python
|
|
Radostin Stoyanov |
46abdd7 |
import argparse
|
|
Radostin Stoyanov |
46abdd7 |
import os
|
|
Radostin Stoyanov |
46abdd7 |
|
|
Radostin Stoyanov |
46abdd7 |
diff --git a/test/others/env.sh b/test/others/env.sh
|
|
Radostin Stoyanov |
46abdd7 |
index b514e87d9..e2f63eee3 100755
|
|
Radostin Stoyanov |
46abdd7 |
--- a/test/others/env.sh
|
|
Radostin Stoyanov |
46abdd7 |
+++ b/test/others/env.sh
|
|
Radostin Stoyanov |
46abdd7 |
@@ -13,5 +13,5 @@ fi
|
|
Radostin Stoyanov |
46abdd7 |
#export PYTHON
|
|
Radostin Stoyanov |
46abdd7 |
CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
|
|
Radostin Stoyanov |
46abdd7 |
crit=$CRIT
|
|
Radostin Stoyanov |
46abdd7 |
-CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu-coredump/criu-coredump)
|
|
Radostin Stoyanov |
46abdd7 |
+CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu-coredump/coredump-"${PYTHON}")
|
|
Radostin Stoyanov |
46abdd7 |
criu_coredump=$CRIU_COREDUMP
|
|
Radostin Stoyanov |
46abdd7 |
--
|
|
Radostin Stoyanov |
46abdd7 |
2.34.1
|
|
Radostin Stoyanov |
46abdd7 |
|