From patchwork Mon Aug 13 10:50:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 10696 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E2A0C23E29 for ; Mon, 13 Aug 2012 10:50:20 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7B0D5A184EC for ; Mon, 13 Aug 2012 10:50:20 +0000 (UTC) Received: by ggmi2 with SMTP id i2so1143654ggm.11 for ; Mon, 13 Aug 2012 03:50:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=T2r3s7oOOK7MCFIOD0H+5/OPpxxpxUyav/qNFBkLkLo=; b=mUyrDAcnzwMRHccacsOk+5W/DONG2QAb9UoTjB4GkQFEwbjhSHSDbrtQxW5miPviXf 7+UZu7BvHHy4bzAdAcBfgzPoThFT3PCcV3PE6pGqlLvbe6tvpVp8MIaMiXjUmLoQU5k3 /oR8i4dL2ZJ7LU5xf6crmv3OU7xKRUawkhKtDYu6zD5VkX+fVuIzlIcT9bJJRJKZ+Frw zEvJL6eGnUuM+jTWmZH9/PQag4y0qKfhPzxxWAi9DTO9lCrtoS/Kd3y7zJ+4kdIKqr2e W2VuuBOOru5J3boZjuiGAQcsgoNbbNReph/3q4TaaCPTL6cKYIq8p67W1dWbulOEC3jj ghxA== Received: by 10.50.159.135 with SMTP id xc7mr4804483igb.9.1344855019814; Mon, 13 Aug 2012 03:50:19 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp171039igc; Mon, 13 Aug 2012 03:50:18 -0700 (PDT) Received: by 10.216.244.203 with SMTP id m53mr6478053wer.46.1344855018051; Mon, 13 Aug 2012 03:50:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id y45si9164206web.30.2012.08.13.03.50.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 03:50:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1T0sDx-0005WW-Dm for ; Mon, 13 Aug 2012 10:50:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 51697E0405 for ; Mon, 13 Aug 2012 10:50:17 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 245 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 245: Android: Properly handle spaces in extra intent options. Message-Id: <20120813105017.1482.53798.launchpad@ackee.canonical.com> Date: Mon, 13 Aug 2012 10:50:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15791"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 10e0b4e9084ba3d8f9b3f4b4af458af7247b7a3a X-Gm-Message-State: ALoCoQnPFjM0ZbxyYUuokNlUnK5bThB/AZnk1AKfupxBzTWfSIonnf/gzwkGPtBvJ8rJcnR+XndT ------------------------------------------------------------ revno: 245 fixes bug: https://launchpad.net/bugs/1031780 committer: Alexandros Frantzis branch nick: trunk timestamp: Mon 2012-08-13 13:10:52 +0300 message: Android: Properly handle spaces in extra intent options. Surround the benchmark text definitions in quotes to ensure spaces are properly handled. This leverages the recently introduced (rev 244) Util::split() support for bash-like quoting rules. modified: android/src/org/linaro/glmark2/EditorActivity.java android/src/org/linaro/glmark2/MainActivity.java --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'android/src/org/linaro/glmark2/EditorActivity.java' --- android/src/org/linaro/glmark2/EditorActivity.java 2012-07-18 16:10:51 +0000 +++ android/src/org/linaro/glmark2/EditorActivity.java 2012-08-13 10:10:52 +0000 @@ -88,7 +88,7 @@ runButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { Intent intent = new Intent(EditorActivity.this, Glmark2Activity.class); - String args = "-b " + getBenchmarkDescriptionText(); + String args = "-b \"" + getBenchmarkDescriptionText() + "\""; intent.putExtra("args", args); startActivity(intent); } === modified file 'android/src/org/linaro/glmark2/MainActivity.java' --- android/src/org/linaro/glmark2/MainActivity.java 2012-07-31 10:35:18 +0000 +++ android/src/org/linaro/glmark2/MainActivity.java 2012-08-13 10:10:52 +0000 @@ -323,7 +323,7 @@ Intent intent = new Intent(MainActivity.this, Glmark2Activity.class); String args = ""; for (int i = 0; i < benchmarks.size() - 1; i++) - args += "-b " + benchmarks.get(i) + " "; + args += "-b \"" + benchmarks.get(i) + "\" "; if (prefs.getBoolean("run_forever", false)) args += "--run-forever "; if (prefs.getBoolean("log_debug", false))